Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/conema3.h

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/conema3.h (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/conema3.h

@@ -4 +4 @@
 !
       real epmax             ! 0.993
+      real coef_epmax_cape             ! 0.993
 !jyg<
       REAL  cvl_comp_threshold     ! 0.
@@ -13 +14 @@
 
 !jyg<
-!!      common/comconema1/epmax,ok_adj_ema,iflag_clw,sig1feed,sig2feed
+!!      common/comconema1/epmax,coef_epmax_cape,ok_adj_ema,iflag_clw,sig1feed,sig2feed
 !!      common/comconema2/iflag_cvl_sigd
-      common/comconema1/epmax, cvl_comp_threshold, cvl_sig2feed
+      common/comconema1/epmax,coef_epmax_cape, cvl_comp_threshold, cvl_sig2feed
       common/comconema2/iflag_cvl_sigd, iflag_clw, ok_adj_ema
 !>jyg
 
-!      common/comconema/epmax,ok_adj_ema,iflag_clw
+!      common/comconema/epmax,coef_epmax_cape,ok_adj_ema,iflag_clw
 !$OMP THREADPRIVATE(/comconema1/)
 !$OMP THREADPRIVATE(/comconema2/)