Changeset 4974 for LMDZ6/branches/cirrus

Timestamp:

Jun 7, 2024, 3:50:59 PM (6 months ago)

Author:

aborella

Message:

Modifs mineures sur des barrieres + modif poprecip deja integree dans la trunk

Location:

LMDZ6/branches/cirrus/libf/phylmd

Files:

• lmdz_lscp_condensation.F90 (modified) (2 diffs)
• lmdz_lscp_poprecip.F90 (modified) (1 diff)

LMDZ6/branches/cirrus/libf/phylmd/lmdz_lscp_condensation.F90

@@ -454 +454 @@
         
         qvapincld = qvc(i) / cldfra(i)
-        !--The vapor in cloud cannot be higher than the
-        !--condensation threshold
-        qvapincld = MIN(qvapincld, gamma_cond(i) * qsat(i))
         qiceincld = ( qcld(i) / cldfra(i) - qvapincld )
         
         !--If the ice water content is too low, the cloud is purely sublimated
+        !--Most probably, we advected a cloud with no ice water content (possible
+        !--if the entire cloud precipited for example)
         IF ( qiceincld .LT. eps ) THEN
           dcf_sub(i) = - cldfra(i)
@@ -471 +470 @@
         !--Else, the cloud is adjusted and sublimated
         ELSE
+
+          !--The vapor in cloud cannot be higher than the
+          !--condensation threshold
+          qvapincld = MIN(qvapincld, gamma_cond(i) * qsat(i))
+          qiceincld = ( qcld(i) / cldfra(i) - qvapincld )
 
           IF ( ok_unadjusted_clouds ) THEN

LMDZ6/branches/cirrus/libf/phylmd/lmdz_lscp_poprecip.F90

@@ -246 +246 @@
     snow(i) = snowclr(i) + snowcld(i)
 
-  ELSE
+  ELSEIF ( ( rain(i) + snow(i) ) .LE. 0. ) THEN
     !--If no precip, we reinitialize the cloud fraction used for the precip to 0 
     precipfraccld(i) = 0.