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

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -15 +15 @@
                   dd_t, dd_q, lalim_conv, wght_th, &                 ! RomP
                   evap, ep, epmlmMm, eplaMm, &                       ! RomP
-                  wdtrainA, wdtrainM, wght)                          ! RomP+RL
+                  wdtrainA, wdtrainM, wght, qtc, sigt, &
+                  tau_cld_cv, coefw_cld_cv)                           ! RomP+RL, AJ
 !RomP <<<
 ! **************************************************************
@@ -29 +30 @@
   USE dimphy
   USE infotrac, ONLY: nbtr
+  USE phys_local_var_mod, ONLY: omega
   IMPLICIT NONE
 ! ======================================================================
@@ -135 +137 @@
   REAL dplcldt(klon), dplcldr(klon)
   REAL qcondc(klon, klev)
+  REAL qtc(klon, klev)
+  REAL sigt(klon, klev)
   REAL wd(klon)
   REAL plim1(klon), plim2(klon), asupmax(klon, klev)
@@ -141 +145 @@
   REAL sigd(klon)
   REAL zx_t, zdelta, zx_qs, zcor
+  REAL tau_cld_cv, coefw_cld_cv
 
 !   INTEGER iflag_mix
@@ -203 +208 @@
 !$OMP THREADPRIVATE(itap, igout)
 
+
   include "YOMCST.h"
   include "YOMCST2.h"
@@ -398 +404 @@
                     t, q, qs, t_wake, q_wake, qs_wake, s_wake, u, v, tra, &
                     em_p, em_ph, &
-                    Ale, Alp, &
+                    Ale, Alp, omega, &
                     em_sig1feed, em_sig2feed, em_wght, &
                     iflag, d_t, d_q, d_u, d_v, d_tra, rain, kbas, ktop, &
@@ -411 +417 @@
                     da, phi, mp, phi2, d1a, dam, sij, wght, &           ! RomP+RL
                     clw, elij, evap, ep, epmlmMm, eplaMm, &             ! RomP+RL
-                    wdtrainA, wdtrainM)                                 ! RomP
+                    wdtrainA, wdtrainM, qtc, sigt, &
+                    tau_cld_cv, coefw_cld_cv)                           ! RomP,AJ
 !AC!+!RomP+jyg
   END IF