Changeset 3624 for LMDZ6/trunk/libf/phylmd/cv3_routines.F90

Timestamp:

Jan 27, 2020, 10:50:54 AM (5 years ago)

Author:

jyg

Message:

Correction to commit 3614:
A new formula is used for "phinu2p" (hopefully
correct) in subroutine cv3_undilute2 in
cv3_routines.F90.

File:

• LMDZ6/trunk/libf/phylmd/cv3_routines.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/cv3_routines.F90

@@ -1190 +1190 @@
   REAL tg, qg, dqgdT, ahg, alv, alf, s, tc, es, esi, denom, rg, tca, elacrit
   REAL                                               :: phinu2p
-  REAL als
+  REAL                                               :: qhthreshold
+  REAL                                               :: als
   REAL                                               :: qsat_new, snew
   REAL, DIMENSION (nloc,nd)                          :: qi
@@ -1494 +1495 @@
             elacrit = elcrit*min(max(1.-(tp(i,k)-T0)/Tlcrit, 0.), 1.)                   !!jygprl
 !!!!            qcld(i,k) = min(clw(i,k), elacrit)                                          !!jygprl
-            qcld(i,k) = min(clw(i,k), elacrit*(1.-qta(i,k-1))/(1.-elacrit))             !!jygprl
-            phinu2p = max(qhsat(i,k-1) + qcld(i,k-1) - (qhsat(i,k) + qcld(i,k)),0.)   !!jygprl
+            qhthreshold = elacrit*(1.-qta(i,k-1))/(1.-elacrit)
+            qcld(i,k) = min(clw(i,k), qhthreshold)             !!jygprl
+!!!!            phinu2p = max(qhsat(i,k-1) + qcld(i,k-1) - (qhsat(i,k) + qcld(i,k)),0.)   !!jygprl
+            phinu2p = max(clw(i,k) - max(qta(i,k-1) - qhsat(i,k-1), qhthreshold), 0.)
             qpl(i,k) = qpl(i,k-1) + (1.-frac(i,k))*phinu2p                            !!jygprl
             qps(i,k) = qps(i,k-1) + frac(i,k)     *phinu2p                            !!jygprl