Changeset 2641 for LMDZ5/branches/testing/libf/phylmd/cv3_routines.F90

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -238 +238 @@
 ! gz = phi at the full levels (same as p).
 
-  DO i = 1, len
-    gz(i, 1) = 0.0
-  END DO
+!!  DO i = 1, len                    !jyg
+!!    gz(i, 1) = 0.0                 !jyg
+!!  END DO                           !jyg
+    gz(:,:) = 0.                     !jyg: initialization of the whole array
 ! ori      do 140 k=2,nlp
   DO k = 2, nl ! convect3
@@ -409 +410 @@
     IF (ok_new_feed) THEN
       IF (iter==niter) THEN
-        DO k = minorig, nl
+        DO i = 1,len                         !jyg
+          pfeedmin(i) = ph(i,minorig+1)      !jyg
+        ENDDO                                !jyg
+        DO k = minorig+1, nl                 !jyg
+!!        DO k = minorig, nl                 !jyg
           DO i = 1, len
             IF (ph(i,k)>=plclfeed(i)) pfeedmin(i) = ph(i, k)
@@ -1055 +1060 @@
                          p, ph, h, tv, lv, lf, pbase, buoybase, plcl, &
                          inb, tp, tvp, clw, hp, ep, sigp, buoy, frac)
+  USE print_control_mod, ONLY: prt_level
   IMPLICIT NONE
 
@@ -1113 +1119 @@
   REAL fracg
   REAL deltap
+
+  IF (prt_level >= 10) THEN
+    print *,'cv3_undilute2.0. t(1,k), q(1,k), qs(1,k) ', &
+                        (k, t(1,k), q(1,k), qs(1,k), k = 1,nl)
+  ENDIF
 
 ! =====================================================================
@@ -1299 +1310 @@
     END DO
   END DO
+
+  IF (prt_level >= 10) THEN
+    print *,'cv3_undilute2.1. tp(1,k), tvp(1,k) ', &
+                          (k, tp(1,k), tvp(1,k), k = 1,nl)
+  ENDIF
 
 ! =====================================================================