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

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/concvl.F90 (modified) (4 diffs)

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

@@ -16 +16 @@
                   evap, ep, epmlmMm, eplaMm, &                       ! RomP
                   wdtrainA, wdtrainM, wght, qtc, sigt, &
-                  tau_cld_cv, coefw_cld_cv)                           ! RomP+RL, AJ
+                  tau_cld_cv, coefw_cld_cv, &                           ! RomP+RL, AJ
 !RomP <<<
+                  epmax_diag) ! epmax_cape
 ! **************************************************************
 ! *
@@ -148 +149 @@
   REAL zx_t, zdelta, zx_qs, zcor
   REAL tau_cld_cv, coefw_cld_cv
+  REAL epmax_diag(klon) ! epmax_cape
 
 !   INTEGER iflag_mix
@@ -388 +390 @@
                    da, phi, mp, phi2, d1a, dam, sij, clw, elij, &       !RomP
                    evap, ep, epmlmMm, eplaMm, &                         !RomP
-                   wdtrainA, wdtrainM)                                  !RomP
+                   wdtrainA, wdtrainM, &                                !RomP
+                   epmax_diag) ! epmax_cape
 !           print *, 'cv_driver ->'      !jyg
 
@@ -425 +428 @@
                     clw, elij, evap, ep, epmlmMm, eplaMm, &             ! RomP+RL
                     wdtrainA, wdtrainM, qtc, sigt, &
-                    tau_cld_cv, coefw_cld_cv)                           ! RomP,AJ
+                    tau_cld_cv, coefw_cld_cv, &                         ! RomP,AJ
 !AC!+!RomP+jyg
+                    epmax_diag) ! epmax_cape
   END IF
 ! ------------------------------------------------------------------