Changeset 3798 for LMDZ6/branches/Ocean_skin/libf/phylmd/cv3_routines.F90

Timestamp:

Jan 11, 2021, 11:24:08 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3_routines.F90 (modified) (4 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/cv3_routines.F90

@@ -888 +888 @@
 ! - relaxation of sig and w0 when no convection
 
-! Caution1: if no convection, we set iflag=4
+! Caution1: if no convection, we set iflag=14
 ! (it used to be 0 in convect3)
 
@@ -968 +968 @@
         sig(i, k) = amax1(sig(i,k), 0.0)
         w0(i, k) = beta*w0(i, k)
-        iflag(i) = 4 ! pour version vectorisee
+        iflag(i) = 14 ! pour version vectorisee
 ! convect3         iflag(i)=0
       END IF
@@ -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