Changeset 5624 for LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90

Timestamp:

Apr 22, 2025, 2:04:21 PM (2 months ago)

Author:

aborella

Message:

Restored energy balance

File:

• LMDZ6/branches/contrails/libf/phylmd/lmdz_lscp.f90 (modified) (7 diffs)

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

@@ -333 +333 @@
   ! for contrails
   REAL, DIMENSION(klon) :: contfra, perscontfra, qcont
+  REAL, DIMENSION(klon) :: zq_nodeep
   LOGICAL, DIMENSION(klon) :: pt_pron_clds
   !--for Lamquin et al 2012 diagnostics
@@ -666 +667 @@
           ENDIF
 
+          zq_nodeep(:) = zq(:)
+
           DO i = 1, klon
 
@@ -677 +680 @@
               !--only in the environment. NB. the clear sky fraction will the be
               !--maximised by 1. - cfcon(i,k)
-              IF ( ptconv(i,k) ) zq(i) = zq(i) - ( qvcon(i,k) + qccon(i,k) ) * cfcon(i,k)
+              IF ( ptconv(i,k) ) &
+                  zq_nodeep(i) = zq(i) - ( qvcon(i,k) + qccon(i,k) ) * cfcon(i,k)
 
               IF ( ( cfcon(i,k) * qccon(i,k) ) .LT. ( cfcon_old(i,k) * qccon_old(i,k) ) ) THEN
@@ -701 +705 @@
               !--Barriers
               cldfra_in(i) = MAX(0., MIN(1. - cfcon(i,k), cldfra_in(i)))
-              qvc_in(i)    = MAX(0., MIN(zq(i), qvc_in(i)))
-              qice_in(i)   = MAX(0., MIN(zq(i) - qvc_in(i), qice_in(i)))
+              qvc_in(i)    = MAX(0., MIN(zq_nodeep(i), qvc_in(i)))
+              qice_in(i)   = MAX(0., MIN(zq_nodeep(i) - qvc_in(i), qice_in(i)))
 
               !--Calculate the shear value (input for condensation and ice supersat)
@@ -808 +812 @@
                         klon, dtime, pplay(:,k), paprs(:,k), paprs(:,k+1), &
                         cfcon(:,k), cldfra_in, qvc_in, qliq_in, qice_in, &
-                        shear, tke_dissip(:,k), cell_area, Tbef, zq, zqs, &
+                        shear, tke_dissip(:,k), cell_area, Tbef, zq_nodeep, zqs, &
                         gammasat, ratqs(:,k), keepgoing, pt_pron_clds, &
                         cldfra_above, icesed_flux,&
@@ -823 +827 @@
                         dcfa_mix(:,k), dqia_mix(:,k), dqta_mix(:,k))
 
+                    DO i = 1, klon
+                      !--If prognostic clouds are activated, deep convection vapor is
+                      !--re-added to the total water vapor
+                      IF ( keepgoing(i) .AND. ptconv(i,k) .AND. pt_pron_clds(i) ) THEN
+                        IF ( ( rneb(i,k) + cfcon(i,k) ) .GT. eps ) THEN
+                          zqn(i) = ( zqn(i) * rneb(i,k) + qccon(i,k) * cfcon(i,k) ) &
+                              / ( rneb(i,k) + cfcon(i,k) )
+                        ELSE
+                          zqn(i) = 0.
+                        ENDIF
+                        rneb(i,k) = rneb(i,k) + cfcon(i,k)
+                        qvc(i) = qvc(i) + qvcon(i,k) * cfcon(i,k)
+                      ENDIF
+                    ENDDO
 
                   ELSE
@@ -1200 +1218 @@
 
       DO i = 1, klon
-
-        !--If prognostic clouds are activated, deep convection vapor is
-        !--re-added to the total water vapor
-        IF ( ptconv(i,k) .AND. pt_pron_clds(i) ) &
-            zq(i) = zq(i) + ( qvcon(i,k) + qccon(i,k) ) * cfcon(i,k)
 
         cf_seri(i,k) = rneb(i,k)