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

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

@@ -8 +8 @@
                                                                         ! RomP
     evap1, ep1, epmlmmm1, eplamm1, & ! RomP
-    wdtraina1, wdtrainm1) ! RomP
+    wdtraina1, wdtrainm1, & ! RomP
+    epmax_diag1) ! epmax_cape
 
   USE dimphy
@@ -144 +145 @@
   REAL epmlmmm1(len, nd, nd), eplamm1(len, nd)
   ! RomP <<<
+  REAL epmax_diag1 (len) ! epmax_cape     
 
   ! -------------------------------------------------------------------
@@ -341 +343 @@
   REAL sigd(nloc)
   ! RomP <<<
+  REAL epmax_diag(nloc) ! epmax_cape
 
   nent(:, :) = 0
@@ -402 +405 @@
   wd1(:) = 0.0
   cape1(:) = 0.0
+  epmax_diag1(:) = 0.0 ! epmax_cape
+
 
   IF (iflag_con==30) THEN
@@ -554 +559 @@
       CALL cv30_closure(nloc, ncum, nd, icb, inb & ! na->nd
         , pbase, p, ph, tv, buoy, sig, w0, cape, m)
+
+      ! epmax_cape
+      call cv30_epmax_fn_cape(nloc,ncum,nd &
+                ,cape,ep,hp,icb,inb,clw,nk,t,h,lv &
+                ,epmax_diag)
+        ! on écrase ep et recalcule hp
     END IF
 
@@ -560 +571 @@
         cpn, iflag, cbmf)
     END IF
+    
 
     ! -------------------------------------------------------------------
@@ -643 +655 @@
         da, phi, mp, phi2, d1a, dam, sij & !RomP
         , elij, clw, epmlmmm, eplamm & !RomP
-        , wdtraina, wdtrainm &     !RomP
+        , wdtraina, wdtrainm,epmax_diag &     !RomP
         , iflag1, precip1, vprecip1, evap1, ep1, sig1, w01 & !RomP
         , ft1, fq1, fu1, fv1, ftra1, inb1, ma1, upwd1, dnwd1, dnwd01, &
         qcondc1, wd1, cape1, da1, phi1, mp1, phi21, d1a1, dam1, sij1 & !RomP
         , elij1, clw1, epmlmmm1, eplamm1 & !RomP
-        , wdtraina1, wdtrainm1) !RomP
+        , wdtraina1, wdtrainm1,epmax_diag1) !RomP
     END IF