Changeset 2253 for LMDZ5/trunk/libf/phylmd/conema3.h

Timestamp:

Mar 30, 2015, 11:08:45 AM (9 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/conema3.h (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/conema3.h

@@ -4 +4 @@
 !
       real epmax             ! 0.993
+!jyg<
+      REAL  cvl_comp_threshold     ! 0.
+!>jyg
       logical ok_adj_ema      ! F
       integer iflag_clw      ! 0
       integer iflag_cvl_sigd
-      real sig1feed      ! 1.
-      real sig2feed      ! 0.95
+      real cvl_sig2feed      ! 0.97
 
-      common/comconema1/epmax,ok_adj_ema,iflag_clw,sig1feed,sig2feed
-      common/comconema2/iflag_cvl_sigd
+!jyg<
+!!      common/comconema1/epmax,ok_adj_ema,iflag_clw,sig1feed,sig2feed
+!!      common/comconema2/iflag_cvl_sigd
+      common/comconema1/epmax, cvl_comp_threshold, cvl_sig2feed
+      common/comconema2/iflag_cvl_sigd, iflag_clw, ok_adj_ema
+!>jyg
 
 !      common/comconema/epmax,ok_adj_ema,iflag_clw
 !$OMP THREADPRIVATE(/comconema1/)
 !$OMP THREADPRIVATE(/comconema2/)
+