Changeset 4397

Timestamp:

Jan 24, 2023, 2:26:51 PM (22 months ago)

Author:

evignon

Message:

Correction d'un beau bug dans l'autoconversion des precip dans lscp (herite de firstilp et
donc encore present dans cette routine). On perd la convergence avec les anciennes versions quand on active lscp

File:

• LMDZ6/trunk/libf/phylmd/lscp_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/lscp_mod.F90

@@ -394 +394 @@
     ! --------------------------------------------------------------------
 
-    IF (iflag_evap_prec.GE.1) THEN ! useless -> to be removed
+    IF (iflag_evap_prec.GE.1) THEN 
 
         ! Calculation of saturation specific humidity
@@ -958 +958 @@
                         zcl=cld_lc_con
                         zct=1./cld_tau_con
-                        zfroi = dtime/REAL(ninter)/zdz(i)*zoliq(i)*velo(i,k)*zfice(i)
+                        zfroi = dtime/REAL(ninter)/zdz(i)*zoliqi(i)*velo(i,k)
                     ELSE
                         zcl=cld_lc_lsc
                         zct=1./cld_tau_lsc
-                        zfroi = dtime/REAL(ninter)/zdz(i)*zoliq(i) &   ! dqice/dt=1/rho*d(rho*wice*qice)/dz
-                            *velo(i,k) * zfice(i)
+                        zfroi = dtime/REAL(ninter)/zdz(i)*zoliqi(i) &   ! dqice/dt=1/rho*d(rho*wice*qice)/dz
+                            *velo(i,k)
                     ENDIF
 
@@ -972 +972 @@
 
 
-                    ! warning: here should be zoliql?
                     IF ((iflag_cloudth_vert.GE.3).AND.(iflag_rain_incloud_vol.EQ.1)) THEN
-                        zchau = zct   *dtime/REAL(ninter) * zoliq(i) &
-                        *(1.0-EXP(-(zoliq(i)/ctot_vol(i,k)/zcl)**2)) *(1.-zfice(i))
+                        zchau = zct   *dtime/REAL(ninter) * zoliql(i) &
+                        *(1.0-EXP(-(zoliql(i)/ctot_vol(i,k)/zcl)**2))
                     ELSE
-                        zchau = zct   *dtime/REAL(ninter) * zoliq(i) &
-                        *(1.0-EXP(-(zoliq(i)/zneb(i)/zcl)**2)) *(1.-zfice(i)) ! dqliq/dt=-qliq/tau*(1-exp(-qcin/clw)**2)
+                        zchau = zct   *dtime/REAL(ninter) * zoliql(i) &
+                        *(1.0-EXP(-(zoliql(i)/zneb(i)/zcl)**2))        ! dqliq/dt=-qliq/tau*(1-exp(-qcin/clw)**2)
                     ENDIF
 
-                    zrain   = MIN(MAX(zchau,0.0),zoliq(i)*(1.-zfice(i)))
-                    zsnow   = MIN(MAX(zfroi,0.0),zoliq(i)*zfice(i)) 
+                    zrain   = MIN(MAX(zchau,0.0),zoliql(i))
+                    zsnow   = MIN(MAX(zfroi,0.0),zoliqi(i)) 
                     zprecip = MAX(zrain + zsnow,0.0)