Changeset 5580 for LMDZ6

Timestamp:

Mar 19, 2025, 4:44:03 PM (3 months ago)

Author:

aborella

Message:

Corrections to previous commit

Location:

LMDZ6/branches/contrails/libf/phylmd

Files:

• lmdz_lscp.f90 (modified) (1 diff)
• lmdz_lscp_condensation.f90 (modified) (1 diff)
• lmdz_lscp_ini.f90 (modified) (1 diff)
• lmdz_lscp_precip.f90 (modified) (3 diffs)

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90

@@ -487 +487 @@
 DO k = klev, 1, -1
 
+    !--Initialisation of advected properties
     cldfra_in(:) = cf_seri(:,k)
-    qvc_in(:) = rvc_seri(:,k) * q_seri(:,k)
+    qvc_in(:) = rvc_seri(:,k) * qt(:,k)
     qliq_in(:) = ql_seri(:,k)
     qice_in(:) = qi_seri(:,k)

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_condensation.f90

@@ -306 +306 @@
         cldfra(i) = MAX(0., MIN(1., cldfra_in(i)))
         qcld(i)   = MAX(0., MIN(qtot(i), qliq_in(i) + qice_in(i) + qvc_in(i)))
-        qvc(i)    = MAX(0., MIN(qcld(i), qvc_in))
+        qvc(i)    = MAX(0., MIN(qcld(i), qvc_in(i)))
         ok_warm_cloud = .TRUE.
       ELSE

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_ini.f90

@@ -344 +344 @@
   !$OMP THREADPRIVATE(snow_fallspeed_cld)
 
-  INTEGER, SAVE, PROTECTED :: ok_precip_resuspension=.FALSE.! Flag to activate the resuspension of ice crystals
+  LOGICAL, SAVE, PROTECTED :: ok_precip_resuspension=.FALSE.! Flag to activate the resuspension of ice crystals
   !$OMP THREADPRIVATE(ok_precip_resuspension)
 

LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp_precip.f90

@@ -800 +800 @@
 dqrevap   = 0.
 dqssubl   = 0.
-IF ( ok_ice_supersat .AND. ok_precip_resuspension ) THEN
+IF ( ok_precip_resuspension ) THEN
   dqsres(:) = 0.
   dcfres(:) = 0.
@@ -1086 +1086 @@
     !--Only the snow flux can go back to cloud, and only if there is no rain flux
     !--(mixed-phase clouds)
-    !--The ok_ice_supersaturation is used to ensure that cloud fraction is advected
-    !--but maybe it is not needed
-    IF ( ok_ice_supersat .AND. ok_precip_resuspension ) THEN
-
-      IF ( (precipfracclr_tmp(i) .GT. 0.) .AND. (rainclr_tmp(i) .LT. eps) ) THEN
-        dsnowres = snowclr_tmp(i) * EXP( - snowclr_tmp(i) / precipfracclr_tmp(i) / snow_thresh_resuspension )
-        dqsres(i) = dqsres(i) - dsnowres / dhum_to_dflux(i)
-        !--The following line determines the in-cloud ice water content of the newly formed cloud
-        !--It is a linear combination between the in-precip ice water content (left term) and the
-        !--in-existing-cloud ice water content (right term). This is done so that the existing cloud
-        !--is not too modified, i.e. unphysical ice fluxes going from the existing cloud to the new
-        !--cloud. If the existing cloud is already large, the newly formed cloud fraction is reduced
-        !--to match the in-cloud ice water content of the existing cloud.
-        !--NB. this is done on qi, not on qvc. Not sure what impact that implies
-        qiceinprecip = - dqsres(i) / precipfracclr_tmp(i) * ( 1. - cldfra(i) ) + qice(i)
-        dcfres(i) = - dqsres(i) / qiceinprecip
-        dqvcres(i) = qvapclr * dcfres(i)
-        !--Add tendencies
-        snowcld_tmp(i) = snowcld_tmp(i) + dsnowres
-      ENDIF
-
-      IF ( (precipfraccld_tmp(i) .GT. 0.) .AND. (raincld_tmp(i) .LT. eps) ) THEN
-        dsnowres = snowcld_tmp(i) * EXP( - snowcld_tmp(i) / precipfraccld_tmp(i) / snow_thresh_resuspension )
-        dqsres(i) = dqsres(i) - dsnowres / dhum_to_dflux(i)
-        !--Add tendencies
-        snowcld_tmp(i) = snowcld_tmp(i) + dsnowres
+    IF ( ok_precip_resuspension ) THEN
+
+      IF ( (snowclr_tmp(i) .GT. 0.) .AND. (precipfracclr_tmp(i) .GT. eps) &
+              .AND. (rainclr_tmp(i) .LT. eps) ) THEN
+        IF ( dsnowres .GT. 0. ) THEN
+          dsnowres = snowclr_tmp(i) * EXP( - snowclr_tmp(i) / precipfracclr_tmp(i) &
+                                             / snow_thresh_resuspension )
+          dqsres(i) = dqsres(i) - dsnowres / dhum_to_dflux(i)
+          !--The following line determines the in-cloud ice water content of the newly formed cloud
+          !--It is a linear combination between the in-precip ice water content (left term) and the
+          !--in-existing-cloud ice water content (right term). This is done so that the existing
+          !--cloud is not too modified, i.e. unphysical ice fluxes going from the existing cloud
+          !--to the new cloud. If the existing cloud is already large, the newly formed cloud
+          !--fraction is reduced to match the in-cloud ice water content of the existing cloud.
+          !--NB. this is done on qi, not on qvc. Not sure what impact that implies
+          qiceinprecip = - dqsres(i) / precipfracclr_tmp(i) * ( 1. - cldfra(i) ) + qice(i)
+          dcfres(i) = - dqsres(i) / qiceinprecip
+          dqvcres(i) = qvapclr * dcfres(i)
+          !--Add tendencies
+          snowcld_tmp(i) = snowcld_tmp(i) + dsnowres
+        ENDIF
+      ENDIF
+
+      IF ( (snowcld_tmp(i) .GT. 0.) .AND. (precipfraccld_tmp(i) .GT. 0.) &
+              .AND. (raincld_tmp(i) .LT. eps) ) THEN
+        IF ( dsnowres .GT. 0. ) THEN
+          dsnowres = snowcld_tmp(i) * EXP( - snowcld_tmp(i) / precipfraccld_tmp(i) &
+                                             / snow_thresh_resuspension )
+          dqsres(i) = dqsres(i) - dsnowres / dhum_to_dflux(i)
+          !--Add tendencies
+          snowcld_tmp(i) = snowcld_tmp(i) + dsnowres
+        ENDIF
       ENDIF
 
@@ -1118 +1124 @@
       qvc(i) = qvc(i) + dqvcres(i)
       qice(i) = qice(i) - dqsres(i)
+      !--Recall that qvap is here the total water in the gridbox
+      qvap(i) = qvap(i) - dqsres(i)
     ENDIF