Changeset 3128 for trunk

Timestamp:

Nov 17, 2023, 1:15:00 PM (12 months ago)

Author:

jbclement

Message:

Mars PCM:
Correction of a bug related to r3126: 'choice_ads' did not have a default value which made the model crash. 'choice_ads = 0' is the default value (no adsorption).
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/conf_phys.F (modified) (2 diffs)
• libf/phymars/soilwater.F90 (modified) (5 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4345 +4345 @@
 - Initialization of zdq at first sub time step (spenttime=0)
 - Move 'coef' to fix the formula for zimicro
+
+== 17/11/2023 == JBC
+Correction of a bug related to r3126: 'choice_ads' did not have a default value which made the model crash. 'choice_ads = 0' is the default value (no adsorption).

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

@@ -1010 +1010 @@
 
 ! Adsorption
-         adsorption_soil = .false.
+         adsorption_soil = .false. ! default value
          call getin_p("adsorption_soil",adsorption_soil) 
          if (adsorption_soil .and. (.not. water)) then
@@ -1018 +1018 @@
          endif  
 
-         if(adsorption_soil) choice_ads = 1
+         choice_ads = 0 ! default value (no adsorption)
+         if (adsorption_soil) choice_ads = 1
          call getin_p("choice_ads",choice_ads) 
            

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

@@ -1 @@
-
 subroutine soilwater(ngrid, nlayer, nq, nsoil, nqsoil, ptsrf,tsoil, ptimestep,  & 
       exchange, qsat_surf, pq, pa, pb, pc, pd, pdqsdifpot, pqsurf,  & 
@@ -375 +374 @@
                               endif
 
-                              if(choice_ads .ne. 3) adswater(ig, ik) = min(Ka(ig, ik) / Kd(ig, ik) * znsoil(ig, ik), adswater_sat)
+                              if(choice_ads .ne. 0) adswater(ig, ik) = min(Ka(ig, ik) / Kd(ig, ik) * znsoil(ig, ik), adswater_sat)
                               
                         else  ! in 3D simulations initialisation happens with newstart.F
@@ -383 +382 @@
                         endif
 
-                        if (choice_ads.eq.3) then ! no adsorption
+                        if (choice_ads.eq.0) then ! no adsorption
 
                                Ka(:, :) = 0.
@@ -601 +600 @@
                   ! calculate the amount of water vapor at adorption saturation
                  
-                  if (choice_ads.ne.3) nsat(ig, ik) = adswater_sat * Kd(ig, ik) / Ka(ig, ik)
+                  if (choice_ads.ne.0) nsat(ig, ik) = adswater_sat * Kd(ig, ik) / Ka(ig, ik)
 
                   ! calculate C, E, and F coefficients for later calculations
@@ -1299 +1298 @@
                   
                   ! calculate how close the water vapor content is to saturizing the adsorbed water
-                  if (choice_ads.ne.3) preduite(ig, ik) = znsoil(ig, ik) / nsat(ig, ik)
+                  if (choice_ads.ne.0) preduite(ig, ik) = znsoil(ig, ik) / nsat(ig, ik)
                   
                   ! write the results to the return variable