Changeset 2253 for LMDZ5/trunk/libf/phylmd/concvl.F90

Timestamp:

Mar 30, 2015, 11:08:45 AM (10 years ago)

Author:

jyg

Message:

1/ Introduction of two variables in the ".def" files: (i) cvl_sig2feed is
the top of the convective feeding layer in sigma coordinates (D=0.97);
(ii) cvl_comp_threshold is the threshold fraction of convective points
below which compression occurs (D=1.).
2/ Corrections of various bugs revealed by the changes in compression:

• correct bugs in cv3a_uncompress.F90 for 3 fields used for convective

scavenging.

• add a reset to zero of "sig" and "w0" for non-convective points

(cva_driver.F90).

• in cv3_routines.F90, correct bounds of a few loops in cv3_undilute2,

correct the reset of the no-convection counter in cv3_yield.

• in phys_output_write_mod.F90, correct output of wdtrainA and wdtrainM.

3/ Improve declarations in various subroutines.

Modified files:

conema3.h
cv3param.h
cv3p1_closure.F90
conf_phys_m.F90
cv3a_compress.F90
phys_output_write_mod.F90
cv3_routines.F90
concvl.F90
cva_driver.F90
cv3a_uncompress.F90

File:

• LMDZ5/trunk/libf/phylmd/concvl.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/concvl.F90

@@ -214 +214 @@
   include "FCTTRE.h"
   include "iniprint.h"
+!jyg<
+  include "conema3.h"
+!>jyg
 
   IF (first) THEN
@@ -307 +310 @@
 
   em_sig1feed = 1.
-  em_sig2feed = 0.97
+!jyg<
+!  em_sig2feed = 0.97
+  em_sig2feed = cvl_sig2feed
+!>jyg
 ! em_sig2feed = 0.8
 ! Relative Weight densities
@@ -401 +407 @@
     CALL cva_driver(klon, klev, klev+1, ntra, nloc, &
                     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, &