Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phyetat0.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/phyetat0.F90 (modified) (3 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phyetat0.F90

@@ -18 +18 @@
        wake_deltat, wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
        wake_s, wake_dens, zgam, zmax0, zmea, zpic, zsig, &
-       zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, u10m, v10m, treedrg, &
-       ale_wake, ale_bl_stat
+       zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, u10m, v10m, treedrg
 !FC
   USE geometry_mod, ONLY : longitude_deg, latitude_deg
@@ -121 +120 @@
   tab_cntrl(6)=nbapp_rad
 
-  if (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
+  if (cycle_diurne) tab_cntrl( 7) =1.
   if (soil_model) tab_cntrl( 8) =1.
   if (new_oliq) tab_cntrl( 9) =1.
@@ -420 +419 @@
   found=phyetat0_get(1,ale_bl_trig,"ALE_BL_TRIG","ALE BL_TRIG",0.)
   found=phyetat0_get(1,alp_bl,"ALP_BL","ALP BL",0.)
-  found=phyetat0_get(1,ale_wake,"ALE_WAKE","ALE_WAKE",0.)
-  found=phyetat0_get(1,ale_bl_stat,"ALE_BL_STAT","ALE_BL_STAT",0.)
 
 !===========================================