Changeset 5520 for LMDZ6/trunk

Timestamp:

Feb 3, 2025, 3:19:32 PM (7 hours ago)

Author:

evignon

Message:

revert du commit sur rhcl dans lscp

File:

• LMDZ6/trunk/libf/phylmd/lmdz_lscp.f90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_lscp.f90

@@ -841 +841 @@
             IF (mpc_bl_points(i,k) .GT. 0) THEN
                 zcond(i) = MAX(0.0,qincloud_mpc(i))*rneb(i,k)
+                ! following line is very strange and probably wrong
+                rhcl(i,k)= (zqs(i)+zq(i))/2./zqs(i)
+                ! Correct calculation of clear-sky relative humidity. To activate once
+                ! issues related to zqn>zq in bi-gaussian clouds are corrected
                 !--Relative humidity (no unit) in clear sky, calculated as rh = q / qsat
                 !--This is slighly approximated, the actual formula is
@@ -846 +850 @@
                 !--Here, rh = (qtot - qincld * cldfra) / clrfra / qsat
                 !--where (qtot - qincld * cldfra) is the grid-mean clear sky water content
-                rhcl(i,k) = ( zq(i) - qincloud_mpc(i) * rneb(i,k) ) / ( 1. - rneb(i,k) ) / zqs(i)
+                ! rhcl(i,k) = ( zq(i) - qincloud_mpc(i) * rneb(i,k) ) / ( 1. - rneb(i,k) ) / zqs(i)
                 ! water vapor update and partition function if thermals
                 zq(i) = zq(i) - zcond(i)        
@@ -876 +880 @@
                       zcond(i) = MAX(0.0,zqn(i)-zqs(i))*rneb(i,k)
                     ENDIF
+                    ! Overwrite partitioning for non shallow-convective clouds if iflag_icefrac>1 (icefrac turb param) 
+                    IF (iflag_icefrac .GE. 1) THEN
+                        IF (lognormale(i)) THEN  
+                           zcond(i)  = zqliq(i) + zqice(i)
+                           zfice(i)  = zfice_turb(i)
+                        ENDIF
+                    ENDIF
+
+                    ! following line is very strange and probably wrong
+                    rhcl(i,k)= (zqs(i)+zq(i))/2./zqs(i)
+                    ! Correct calculation of clear-sky relative humidity. To activate once
+                    ! issues related to zqn>zq in bi-gaussian clouds are corrected
                     !--Relative humidity (no unit) in clear sky, calculated as rh = q / qsat
                     !--This is slighly approximated, the actual formula is
@@ -881 +897 @@
                     !--Here, rh = (qtot - qincld * cldfra) / clrfra / qsat
                     !--where (qtot - qincld * cldfra) is the grid-mean clear sky water content
-                    rhcl(i,k) = ( zq(i) - zqn(i) * rneb(i,k) ) / ( 1. - rneb(i,k) ) / zqs(i)
-                    ! Overwrite partitioning for non shallow-convective clouds if iflag_icefrac>1 (icefrac turb param) 
-                    IF (iflag_icefrac .GE. 1) THEN
-                        IF (lognormale(i)) THEN  
-                           zcond(i)  = zqliq(i) + zqice(i)
-                           zfice(i)  = zfice_turb(i)
-                           rhcl(i,k) = zqvapcl(i) * rneb(i,k) + (zq(i) - zqn(i)) * (1.-rneb(i,k))
-                        ENDIF
-                    ENDIF
+                    ! rhcl(i,k) = ( zq(i) - zqn(i) * rneb(i,k) ) / ( 1. - rneb(i,k) ) / zqs(i)
+                    ! Overwrite partitioning for non shallow-convective clouds if iflag_icefrac>1 (icefrac turb param)
+
                 ENDIF