Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cv3_routines.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cv3_routines.F90

@@ -3405 +3405 @@
 DO i = 2, nlp
   DO il = 1, ncum
-    IF (i<=inb(il)+1) THEN
-      upwd(il,i) = max(0., upwd(il,i-1) - up_to(il,i-1) + up_from(il,i-1))
-    ENDIF
+    upwd(il,i) = max(0., upwd(il,i-1) - up_to(il,i-1) + up_from(il,i-1))
   ENDDO
 ENDDO
@@ -4374 +4372 @@
 
 !inputs:
-  INTEGER, INTENT (IN)                               :: ncum, nd, na, nloc, len
-  INTEGER, DIMENSION (len), INTENT (IN)              :: icb, inb
-  REAL, DIMENSION (len, na, na), INTENT (IN)         :: ment, sigij, elij
-  REAL, DIMENSION (len, nd), INTENT (IN)             :: clw
-  REAL, DIMENSION (len, na), INTENT (IN)             :: ep
-  REAL, DIMENSION (len, nd+1), INTENT (IN)           :: Vprecip
+  INTEGER ncum, nd, na, nloc, len
+  REAL ment(nloc, na, na), sigij(nloc, na, na)
+  REAL clw(nloc, nd), elij(nloc, na, na)
+  REAL ep(nloc, na)
+  INTEGER icb(nloc), inb(nloc)
+  REAL Vprecip(nloc, nd+1)
 !ouputs:
-  REAL, DIMENSION (len, na, na), INTENT (OUT)        :: phi, phi2, epmlmMm
-  REAL, DIMENSION (len, na), INTENT (OUT)            :: da, d1a, dam, eplaMm
-!
+  REAL da(nloc, na), phi(nloc, na, na)
+  REAL phi2(nloc, na, na)
+  REAL d1a(nloc, na), dam(nloc, na)
+  REAL epmlmMm(nloc, na, na), eplaMm(nloc, na)
 ! variables pour tracer dans precip de l'AA et des mel
 !local variables: