Changeset 2542 for LMDZ5/branches/testing/libf/phylmd/cv3p2_closure.F90

Timestamp:

Jun 6, 2016, 4:04:57 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2487:2541 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -126 +126 @@
   DO k = 1, nl
     DO il = 1, ncum
-      m(il, k) = 0.0
       rhodp(il,k) = 0.007*p(il, k)*(ph(il,k)-ph(il,k+1))/tv(il, k)
     END DO
   END DO
 
-!CR: initializations for erosion of adiabatic ascent 
-  DO k = 1,nl
+!CR+jyg: initializations (up to nd) for erosion of adiabatic ascent and of m and wlim
+  DO k = 1,nd
     DO il = 1, ncum
         mad(il,k)=0.
@@ -138 +137 @@
         betalim(il,k)=1.
         wlim(il,k)=0.
+        m(il, k) = 0.0
     ENDDO
   ENDDO
@@ -711 +711 @@
 
 !Verification sum(me)=sum(m)
-  DO k = 1,nl+1
+  DO k = 1,nd
     DO il = 1, ncum
        md(il,k)=0.