Changeset 2435 for LMDZ5/branches/testing/libf/phylmd/cva_driver.F90

Timestamp:

Jan 28, 2016, 5:02:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cva_driver.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/phylmd/cva_driver.F90

@@ -622 +622 @@
   END DO
 
+!!  IF (iflag_con==3) THEN
+!!    DO il = 1, len
+!!      sig1(il, nd) = sig1(il, nd) + 1.
+!!      sig1(il, nd) = amin1(sig1(il,nd), 12.1)
+!!    END DO
+!!  END IF
+
   IF (iflag_con==3) THEN
-    DO il = 1, len
-      sig1(il, nd) = sig1(il, nd) + 1.
-      sig1(il, nd) = amin1(sig1(il,nd), 12.1)
-    END DO
-  END IF
+      CALL cv3_incrcount(len,nd,delt,sig1)
+  END IF  ! (iflag_con==3)
 
 ! RomP >>>
@@ -876 +880 @@
       CALL cv3_undilute2(nloc, ncum, nd, icb, icbs, nk, &              !na->nd
                          tnk, qnk, gznk, hnk, t, q, qs, gz, &
-                         p, h, tv, lv, lf, pbase, buoybase, plcl, &
+                         p, ph, h, tv, lv, lf, pbase, buoybase, plcl, &
                          inb, tp, tvp, clw, hp, ep, sigp, buoy, &
                          frac)
@@ -892 +896 @@
 ! -------------------------------------------------------------------
     IF (iflag_con==3) THEN
-      IF ((iflag_ice_thermo==1) .AND. (iflag_mix/=0)) THEN
-        WRITE (*, *) ' iflag_ice_thermo==1 requires iflag_mix==0', ' but iflag_mix=', iflag_mix, &
-          '. Might as well stop here.'
-        STOP
-      END IF
+!      IF ((iflag_ice_thermo==1) .AND. (iflag_mix/=0)) THEN
+!        WRITE (*, *) ' iflag_ice_thermo==1 requires iflag_mix==0', ' but iflag_mix=', iflag_mix, &
+!          '. Might as well stop here.'
+!        STOP
+!      END IF
       IF (iflag_mix>=1) THEN
         CALL zilch(supmax, nloc*klev)
         CALL cv3p_mixing(nloc, ncum, nd, nd, ntra, icb, nk, inb, &           ! na->nd
-                         ph, t, q, qs, u, v, tra, h, lv, qnk, &
+                         ph, t, q, qs, u, v, tra, h, lv, lf, frac, qnk, &
                          unk, vnk, hp, tv, tvp, ep, clw, sig, &
                          ment, qent, hent, uent, vent, nent, &