Changeset 2488 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

Timestamp:

Apr 3, 2016, 12:09:34 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (4 diffs)

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

@@ -155 +155 @@
     LOGICAL,SAVE :: ok_4xCO2atm_omp
     REAL,SAVE :: epmax_omp
+    REAL,SAVE :: coef_epmax_cape_omp
     LOGICAL,SAVE :: ok_adj_ema_omp
     INTEGER,SAVE :: iflag_clw_omp
@@ -812 +813 @@
     epmax_omp = .993
     call getin('epmax', epmax_omp)
+
+    coef_epmax_cape_omp = 0.0   
+    call getin('coef_epmax_cape', coef_epmax_cape_omp)        
     !
     !Config Key  = ok_adj_ema
@@ -1999 +2003 @@
 
     epmax = epmax_omp
+    coef_epmax_cape = coef_epmax_cape_omp
     ok_adj_ema = ok_adj_ema_omp
     iflag_clw = iflag_clw_omp
@@ -2303 +2308 @@
     write(lunout,*)'iflag_bergeron=',iflag_bergeron
     write(lunout,*)' epmax = ', epmax
+    write(lunout,*)' coef_epmax_cape = ', coef_epmax_cape
     write(lunout,*)' ok_adj_ema = ', ok_adj_ema
     write(lunout,*)' iflag_clw = ', iflag_clw