Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/cva_driver.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/cva_driver.F90 (modified) (6 diffs)

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

@@ -27 +27 @@
                       clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, &        ! RomP, RL
                       wdtrainA1, wdtrainM1, qtc1, sigt1, tau_cld_cv, &
-                      coefw_cld_cv)                                        ! RomP, AJ
+                      coefw_cld_cv, &                                      ! RomP, AJ
+                      epmax_diag1)  ! epmax_cape
 ! **************************************************************
 ! *
@@ -259 +260 @@
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: d1a1, dam1
 ! RomP <<<
+  REAL, DIMENSION (len ), INTENT (OUT)               :: epmax_diag1      
 
 ! -------------------------------------------------------------------
@@ -524 +526 @@
   REAL d1a(len, nd), dam(len, nd)
 ! RomP <<<
+  REAL epmax_diag(nloc) ! epmax_cape
 
   LOGICAL, SAVE :: first = .TRUE.
@@ -892 +895 @@
     END IF
 
+    ! epmax_cape
+    ! on recalcule ep et hp    
+    call cv3_epmax_fn_cape(nloc,ncum,nd &
+                , ep,hp,icb,inb,clw,nk,t,h,hnk,lv,lf,frac &
+                , pbase, p, ph, tv, buoy, sig, w0,iflag &
+                , epmax_diag)
+
 ! -------------------------------------------------------------------
 ! --- MIXING(1)   (if iflag_mix .ge. 1)
@@ -1128 +1138 @@
                            clw, elij, evap, ep, epmlmMm, eplaMm, &       ! RomP
                            wdtrainA, wdtrainM, &                         ! RomP
-                           qtc, sigt, &
+                           qtc, sigt, epmax_diag, & ! epmax_cape
                            iflag1, kbas1, ktop1, &
                            precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, &
@@ -1141 +1151 @@
                            clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, & ! RomP
                            wdtrainA1, wdtrainM1,                       & ! RomP
-                           qtc1, sigt1)
+                           qtc1, sigt1, epmax_diag1) ! epmax_cape
     END IF