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

Timestamp:

Jun 14, 2015, 9:13:32 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -1 +1 @@
 SUBROUTINE concvl(iflag_clos, &
-                  dtime, paprs, pplay, &
+                  dtime, paprs, pplay, k_upper_cv, &
                   t, q, t_wake, q_wake, s_wake, u, v, tra, ntra, &
                   Ale, Alp, sig1, w01, &
@@ -88 +88 @@
 
   REAL dtime, paprs(klon, klev+1), pplay(klon, klev)
+  INTEGER k_upper_cv
   REAL t(klon, klev), q(klon, klev), u(klon, klev), v(klon, klev)
   REAL t_wake(klon, klev), q_wake(klon, klev)
@@ -214 +215 @@
   include "FCTTRE.h"
   include "iniprint.h"
+!jyg<
+  include "conema3.h"
+!>jyg
 
   IF (first) THEN
@@ -307 +311 @@
 
   em_sig1feed = 1.
-  em_sig2feed = 0.97
+!jyg<
+!  em_sig2feed = 0.97
+  em_sig2feed = cvl_sig2feed
+!>jyg
 ! em_sig2feed = 0.8
 ! Relative Weight densities
@@ -399 +406 @@
 !LF   necessary for gathered fields
     nloc = klon
-    CALL cva_driver(klon, klev, klev+1, ntra, nloc, &
+    CALL cva_driver(klon, klev, klev+1, ntra, nloc, k_upper_cv, &
                     iflag_con, iflag_mix, iflag_ice_thermo, &
-                    iflag_clos, ok_conserv_q, dtime, &
+                    iflag_clos, ok_conserv_q, dtime, cvl_comp_threshold, &
                     t, q, qs, t_wake, q_wake, qs_wake, s_wake, u, v, tra, &
                     em_p, em_ph, &