Changeset 3904

Timestamp:

Aug 26, 2025, 2:17:21 PM (5 months ago)

Author:

jbclement

Message:

Mars PCM:
Some adjustments of sanity checks for the compatibility of options 'doubleq' and 'active'.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/conf_phys.F (modified) (1 diff)
• libf/phymars/initracer.F90 (modified) (2 diffs)
• libf/phymars/physiq_mod.F (modified) (3 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4958 +4958 @@
 == 22/08/2025 == JBC
 Case 'icelocationmode = 5' (default) is corrected compared to r2884. Now it reads 'watercaptag' from "startfi.nc" in any circumstances, unless it is missing, in which case 'icelocationmode' is set to 4.
+
+== 26/08/2025 == JBC
+Some adjustments of sanity checks for the compatibility of options 'doubleq' and 'active'.

trunk/LMDZ.MARS/libf/phymars/conf_phys.F

@@ -452 +452 @@
            print*,'if active is used, then dustbin should > 0'
            call abort_physic(modname,
-     &          "active option requires dustbin < 0",1)
+     &          "active option requires dustbin > 0",1)
          endif
 ! doubleq

trunk/LMDZ.MARS/libf/phymars/initracer.F90

@@ -593 +593 @@
 
 if (doubleq) then
+    ! verify that we indeed have dust_mass and dust_number tracers
+    if (igcm_dust_mass == 0) then
+           write(*,*) "initracer: error!"
+            write(*,*) "  Cannot use doubleq option without a dust_mass tracer!"
+           call abort_physic("initracer","doubleq issue",1)
+    endif
+    if (igcm_dust_number == 0) then
+        write(*,*) "initracer: error!"
+        write(*,*) "  Cannot use doubleq option without a dust_number tracer!"
+        call abort_physic("initracer","doubleq issue",1)
+    endif
+
     ! "doubleq" technique
     ! -------------------
@@ -785 +797 @@
 ! some extra (possibly redundant) sanity checks for tracers:
 ! ---------------------------------------------------------
-if (doubleq) then
-    ! verify that we indeed have dust_mass and dust_number tracers
-    if (igcm_dust_mass == 0) then
-           write(*,*) "initracer: error!"
-            write(*,*) "  Cannot use doubleq option without a dust_mass tracer!"
-           call abort_physic("initracer","doubleq issue",1)
-    endif
-    if (igcm_dust_number == 0) then
-        write(*,*) "initracer: error!"
-        write(*,*) "  Cannot use doubleq option without a dust_number tracer!"
-        call abort_physic("initracer","doubleq issue",1)
-        endif
-endif
-
 if ((.not.doubleq).and.(dustbin>0)) then
     ! verify that we indeed have 'dustbin' dust tracers

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -78 +78 @@
      &                          iaer_stormdust_doubleq, iaer_h2o_ice,
      &                          flux_1AU
-      use dust_param_mod, only: doubleq, lifting, callddevil,
+      use dust_param_mod, only: doubleq, lifting, callddevil, active,
      &                          tauscaling, odpref, dustbin,
      &                          dustscaling_mode, dust_rad_adjust,
@@ -2705 +2705 @@
         fluxsurf_dir_dn_sw(ig) = 0.
        else
+          if (doubleq) then
             if (activice) then
              ! both water and dust contribute
@@ -2710 +2711 @@
      &                    exp(-(tau(ig,iaer_dust_doubleq)+
      &                          tau(ig,iaer_h2o_ice))/mu0(ig))
-            else
+            else if (active) then
              ! only dust contributes
             fluxsurf_dir_dn_sw(ig) = flux_1AU/dist_sol/dist_sol*mu0(ig)*
      &                    exp(-(tau(ig,iaer_dust_doubleq))/mu0(ig))
             endif ! of if (water)
-           endif ! of if(mu0(ig).le.0.01)
+          endif ! of if (doubleq)
+         endif ! of if(mu0(ig).le.0.01)
          enddo