Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/cv3p_mixing.F90

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3p_mixing.F90 (modified) (9 diffs)

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

@@ -1 +1 @@
 SUBROUTINE cv3p_mixing(nloc, ncum, nd, na, ntra, icb, nk, inb, &
-                       ph, t, rr, rs, u, v, tra, h, lv, lf, frac, qnk, &
+                       ph, t, rr, rs, u, v, tra, h, lv, lf, frac, qta, &
                        unk, vnk, hp, tv, tvp, ep, clw, sig, &
                        Ment, Qent, hent, uent, vent, nent, &
@@ -29 +29 @@
   INTEGER, DIMENSION (nloc), INTENT (IN)             :: icb, inb, nk
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: sig
-  REAL, DIMENSION (nloc), INTENT (IN)                :: qnk, unk, vnk
+  REAL, DIMENSION (nloc), INTENT (IN)                :: unk, vnk
+  REAL, DIMENSION (nloc, nd), INTENT (IN)            :: qta
   REAL, DIMENSION (nloc, nd+1), INTENT (IN)          :: ph
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: t, rr, rs
@@ -173 +174 @@
                            .AND. (j<=inb(il))) THEN
 
-            rti = qnk(il) - ep(il, i)*clw(il, i)
+!!            rti = qnk(il) - ep(il, i)*clw(il, i)
+            rti = qta(il,i-1) - ep(il, i)*clw(il, i)
             bf2 = 1. + lv(il, j)*lv(il, j)*rs(il, j)/(rrv*t(il,j)*t(il,j)*cpd)
 !jyg(from aj)<
@@ -219 +221 @@
             Sij(il, i, j) = amax1(0.0, Sij(il,i,j))
             Sij(il, i, j) = amin1(1.0, Sij(il,i,j))
+          ELSE IF (j > i) THEN
+            IF (prt_level >= 10) THEN
+              print *,'cv3p_mixing i, j, Sij given by the no-precip eq. ', i, j, Sij(il,i,j)
+            ENDIF
           END IF ! new
         END DO
@@ -248 +254 @@
 !!!       Ment(il,i,i)=m(il,i)
         Ment(il, i, i) = 1.
-        Qent(il, i, i) = qnk(il) - ep(il, i)*clw(il, i)
+!!        Qent(il, i, i) = qnk(il) - ep(il, i)*clw(il, i)
+        Qent(il, i, i) = qta(il,i-1) - ep(il, i)*clw(il, i)
         uent(il, i, i) = unk(il)
         vent(il, i, i) = vnk(il)
@@ -332 +339 @@
       IF (i>=icb(il) .AND. i<=inb(il)) THEN
         lwork(il) = (nent(il,i)/=0)
-        rti = qnk(il) - ep(il, i)*clw(il, i)
+!!        rti = qnk(il) - ep(il, i)*clw(il, i)
+        rti = qta(il,i-1) - ep(il, i)*clw(il, i)
 !jyg<
         IF (cvflag_ice) THEN
@@ -462 +470 @@
             lwork(il)) THEN
           IF (Sij(il,i,j)>0.0) THEN
-            rti = qnk(il) - ep(il, i)*clw(il, i)
+!!            rti = qnk(il) - ep(il, i)*clw(il, i)
+            rti = qta(il,i-1) - ep(il, i)*clw(il, i)
             Qmixmax(il) = Qmix(Sjmax(il))
             Qmixmin(il) = Qmix(Sjmin(il))
@@ -590 +599 @@
               lwork(il)) THEN
             IF (Sij(il,i,j)>0.0) THEN
-              rti = qnk(il) - ep(il, i)*clw(il, i)
+!!              rti = qnk(il) - ep(il, i)*clw(il, i)
+              rti = qta(il,i-1) - ep(il, i)*clw(il, i)
 !!!             Ment(il,i,i) = m(il,i)*abs(Qmixmax(il)*(1.-Sjmax(il))
               Ment(il, i, i) = abs(Qmixmax(il)*(1.-Sjmax(il))+Rmixmax(il) - &
@@ -659 +669 @@
 ! cc        Ment(il,i,i)=m(il,i)
         Ment(il, i, i) = 1.
-        Qent(il, i, i) = qnk(il) - ep(il, i)*clw(il, i)
+!!        Qent(il, i, i) = qnk(il) - ep(il, i)*clw(il, i)
+        Qent(il, i, i) = qta(il,i-1) - ep(il, i)*clw(il, i)
         uent(il, i, i) = unk(il)
         vent(il, i, i) = vnk(il)