Changeset 5412 for LMDZ6/trunk/libf/phylmd/lmdz_lscp.f90

Timestamp:

Dec 16, 2024, 5:54:52 PM (8 hours ago)

Author:

evignon

Message:

mise sous flag d'un bug sur la phase des nuages dans lscp
identifie par A. Borella

File:

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

LMDZ6/trunk/libf/phylmd/lmdz_lscp.f90

@@ -119 +119 @@
 USE lmdz_lscp_ini, ONLY : iflag_autoconversion, ffallv_con, ffallv_lsc, min_frac_th_cld
 USE lmdz_lscp_ini, ONLY : RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT, RD, RG
-USE lmdz_lscp_ini, ONLY : ok_poprecip
+USE lmdz_lscp_ini, ONLY : ok_poprecip, ok_bug_phase_lscp
 USE lmdz_lscp_ini, ONLY : ok_ice_supersat, ok_unadjusted_clouds, iflag_icefrac
 
@@ -1173 +1173 @@
                ! Note that compared to fisrtilp, we always assume iflag_bergeron=2
 
+               IF (ok_bug_phase_lscp) THEN
                     zqpreci(i)=(zcond(i)-zoliq(i))*zfice(i)
                     zqprecl(i)=(zcond(i)-zoliq(i))*(1.-zfice(i))
+               ELSE
+                    zqpreci(i)=zcond(i)*zfice(i)-zoliqi(i)
+                    zqprecl(i)=zcond(i)*(1.-zfice(i))-zoliql(i)
+               ENDIF
                     zcp=RCPD*(1.0+RVTMP2*(zq(i)+zmqc(i)+zcond(i)))
                     coef1 = rneb(i,k)*RLSTT/zcp*zdqsdT_raw(i)
@@ -1265 +1270 @@
         DO i=1,klon
            IF (ziflprev(i) .NE. 0.0) THEN
-              radocondi(i,k)=zoliq(i)*zfice(i)+zqpreci(i)+ziflprev(i)/zrho(i,k+1)/velo(i,k+1)
+              radocondi(i,k)=zoliqi(i)+zqpreci(i)+ziflprev(i)/zrho(i,k+1)/velo(i,k+1)
            ELSE
-              radocondi(i,k)=zoliq(i)*zfice(i)+zqpreci(i)
+              radocondi(i,k)=zoliqi(i)+zqpreci(i)
            ENDIF
            radocond(i,k)=radocondl(i,k)+radocondi(i,k)
@@ -1375 +1380 @@
         subfra(i,k) = 1. - cf_seri(i,k) - issrfra(i,k)
         qsub(i,k) = zq(i) - qvc(i) - qissr(i,k)
-        qcld(i,k) = qvc(i) + zfice(i) * zoliq(i)
+        qcld(i,k) = qvc(i) + zoliq(i)
       ENDDO
     ENDIF
@@ -1389 +1394 @@
         pfraclr(i,k)=znebprecipclr(i)
         pfracld(i,k)=znebprecipcld(i)
-        d_ql(i,k) = (1-zfice(i))*zoliq(i)
-        d_qi(i,k) = zfice(i)*zoliq(i)
         d_q(i,k) = zq(i) - qt(i,k)
-        ! c_iso: same for isotopes
         d_t(i,k) = zt(i) - temp(i,k)
+
+        IF (ok_bug_phase_lscp) THEN
+           d_ql(i,k) = (1-zfice(i))*zoliq(i)
+           d_qi(i,k) = zfice(i)*zoliq(i)
+        ELSE
+           d_ql(i,k) = zoliql(i)
+           d_qi(i,k) = zoliqi(i)    
+        ENDIF
+
     ENDDO