Changeset 3356 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phyredem.F90

Timestamp:

Jun 29, 2018, 12:31:11 PM (6 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

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

@@ +1 @@
+!
+! $Id$
+!
 SUBROUTINE phyredem (fichnom)
 !
@@ -21 +24 @@
                                 wake_cstar,                                  &
                                 wake_pe, wake_fip, fm_therm, entr_therm,     &
-                                detr_therm, Ale_bl, Ale_bl_trig, Alp_bl,     &
+                                detr_therm, ale_bl, ale_bl_trig, alp_bl,     &
+                                ale_wake, ale_bl_stat,                       &
                                 du_gwd_rando, du_gwd_front, u10m, v10m,      &
                                 treedrg
@@ -87 +91 @@
   tab_cntrl(6) = nbapp_rad
 
-  IF( cycle_diurne ) tab_cntrl( 7 ) = 1.
+  IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
   IF(     new_oliq ) tab_cntrl( 9 ) = 1.
@@ -282 +286 @@
   CALL put_field("DETR_THERM", "DETR_THERM", detr_therm)
 
-  CALL put_field("ALE_BL", "ALE_BL", Ale_bl)
-
-  CALL put_field("ALE_BL_TRIG", "ALE_BL_TRIG", Ale_bl_trig)
-
-  CALL put_field("ALP_BL", "ALP_BL", Alp_bl)
+  CALL put_field("ALE_BL", "ALE_BL", ale_bl)
+
+  CALL put_field("ALE_BL_TRIG", "ALE_BL_TRIG", ale_bl_trig)
+
+  CALL put_field("ALP_BL", "ALP_BL", alp_bl)
+
+  CALL put_field("ALE_WAKE", "ALE_WAKE", ale_wake)
+
+  CALL put_field("ALE_BL_STAT", "ALE_BL_STAT", ale_bl_stat)
+
 
   ! trs from traclmdz_mod