Changeset 2536

Timestamp:

Jun 10, 2021, 1:02:31 PM (4 years ago)

Author:

adelavois

Message:

Physics is now allowed to run with water cycle but without radiatively active h2o clouds
callsedim previoulsy stopped if iaero_h2o=O and water=true

File:

• trunk/LMDZ.GENERIC/libf/phystd/callsedim.F (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/callsedim.F

@@ -74 +74 @@
         firstcall=.false.
         ! add some tests on presence of required tracers/aerosols:
-        if (water) then
-          if (igcm_h2o_ice.eq.0) then
+        if (water.and.(igcm_h2o_ice.eq.0)) then
             write(*,*) "callsedim error: water=.true.",
      &                 " but igcm_h2o_ice=0"
           stop
-          endif
-          if (iaero_h2o.eq.0) then
-            write(*,*) "callsedim error: water=.true.",
-     &                 " but iaero_ho2=0"
-          stop
-          endif
         endif
       ENDIF ! of IF (firstcall)
@@ -122 +115 @@
 !======================================================================
 ! Water          
-          if (water.and.(iq.eq.igcm_h2o_ice)) then
+       if (water.and.(iaero_h2o.ne.0).and.(iq.eq.igcm_h2o_ice)) then
             ! compute radii for h2o_ice 
              call h2o_reffrad(ngrid,nlay,zqi(1,1,igcm_h2o_ice),zt,
@@ -132 +125 @@
 
 ! General Case
-          else 
+       else 
              call newsedim(ngrid,nlay,1,ptimestep,
      &            pplev,masse,epaisseur,zt,radius(iq),rho_q(iq),
      &            zqi(1,1,iq),wq)
-          endif
+       endif
 
 !=======================================================================