Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/cv3a_uncompress.F90

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -13 +13 @@
                            wdtrainA, wdtrainM, &                                ! RomP
                            qtc, sigt,          &
-                         
+                           epmax_diag, & ! epmax_cape
                            iflag1, kbas1, ktop1, &
                            precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, &
@@ -26 +26 @@
                            clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, &        ! RomP
                            wdtrainA1, wdtrainM1, &                              ! RomP
-                           qtc1, sigt1)
+                           qtc1, sigt1, &
+                           epmax_diag1) ! epmax_cape
 
   ! **************************************************************
@@ -52 +53 @@
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: sig, w0
   REAL, DIMENSION (nloc), INTENT (IN)                :: ptop2
+  REAL, DIMENSION (nloc), INTENT (IN)                :: epmax_diag
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: ft, fq, fu, fv
   REAL, DIMENSION (nloc, nd, ntra), INTENT (IN)      :: ftra
@@ -86 +88 @@
   REAL, DIMENSION (len), INTENT (OUT)                :: wbeff1
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: sig1, w01
+  REAL, DIMENSION (len), INTENT (OUT)                :: epmax_diag1 ! epmax_cape
   REAL, DIMENSION (len), INTENT (OUT)                :: ptop21
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: ft1, fq1, fu1, fv1
@@ -144 +147 @@
       supmax01(idcum(i)) = supmax0(i)
       asupmaxmin1(idcum(i)) = asupmaxmin(i)
+      epmax_diag1(idcum(i)) = epmax_diag(i)
     END DO