Changeset 3328 for LMDZ6/branches

Timestamp:

May 16, 2018, 6:10:44 PM (7 years ago)

Author:

musat

Message:

Utilisation de la clef iflag_cycle_diurne et
supression de la clef cycle_diurne.

Location:

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys_m.F90 (modified) (4 diffs)
• phyetat0.F90 (modified) (1 diff)
• phyredem.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (2 diffs)
• printflag.F90 (modified) (2 diffs)
• surf_ocean_mod.F90 (modified) (2 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/clesphys.h

@@ -8 +8 @@
 !..include cles_phys.h
 !
-       LOGICAL cycle_diurne,soil_model,new_oliq,ok_orodr,ok_orolf 
+       INTEGER iflag_cycle_diurne
+       LOGICAL soil_model,new_oliq,ok_orodr,ok_orolf 
        LOGICAL ok_limitvrai
        LOGICAL ok_all_xml
@@ -123 +124 @@
 ! THEN INTEGER AND LOGICALS
      &     , top_height                                                 &
-     &     , cycle_diurne, soil_model, new_oliq                         &
+     &     , iflag_cycle_diurne, soil_model, new_oliq                         &
      &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
      &     , iflag_con, nbapp_cv, nbapp_wk                              &

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/conf_phys_m.F90

@@ -213 +213 @@
     LOGICAL,SAVE :: ok_lic_cond_omp
     !
-    LOGICAL,SAVE  :: cycle_diurne_omp,soil_model_omp,new_oliq_omp
+    INTEGER,SAVE  :: iflag_cycle_diurne_omp
+    LOGICAL,SAVE  :: soil_model_omp,new_oliq_omp
     LOGICAL,SAVE  :: ok_orodr_omp, ok_orolf_omp, ok_limitvrai_omp
     INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
@@ -719 +720 @@
     ! Constantes precedemment dans dyn3d/conf_gcm
 
-    !Config  Key  = cycle_diurne
-    !Config  Desc = Cycle ddiurne
-    !Config  Def  = y
+    !Config  Key  = iflag_cycle_diurne
+    !Config  Desc = Cycle diurne
+    !Config  Def  = 1
     !Config  Help = Cette option permet d'eteidre le cycle diurne.
     !Config         Peut etre util pour accelerer le code !
-    cycle_diurne_omp = .TRUE.
-    CALL getin('cycle_diurne',cycle_diurne_omp)
+    iflag_cycle_diurne_omp = 1
+    CALL getin('iflag_cycle_diurne',iflag_cycle_diurne_omp)
 
     !Config  Key  = soil_model
@@ -2165 +2166 @@
     RCFC12_per = RCFC12_per_omp
 
-    cycle_diurne = cycle_diurne_omp
+    iflag_cycle_diurne = iflag_cycle_diurne_omp
     soil_model = soil_model_omp
     new_oliq = new_oliq_omp
@@ -2526 +2527 @@
     write(lunout,*)'ok_lic_melt=', ok_lic_melt
     write(lunout,*)'ok_lic_cond=', ok_lic_cond
-    write(lunout,*)'cycle_diurne=',cycle_diurne
+    write(lunout,*)'iflag_cycle_diurne=',iflag_cycle_diurne
     write(lunout,*)'soil_model=',soil_model
     write(lunout,*)'new_oliq=',new_oliq

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/phyetat0.F90

@@ -121 +121 @@
   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.

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/phyredem.F90

@@ -91 +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.

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

@@ -342 +342 @@
     INTEGER igout
     !======================================================================
-    ! Clef controlant l'activation du cycle diurne:
+    ! Clef iflag_cycle_diurne controlant l'activation du cycle diurne:
     ! en attente du codage des cles par Fred
-    INTEGER iflag_cycle_diurne
-    PARAMETER (iflag_cycle_diurne=1)
+    ! iflag_cycle_diurne est initialise par conf_phys et se trouve 
+    ! dans clesphys.h (IM)
     !======================================================================
     ! Modele thermique du sol, a activer pour le cycle diurne:
@@ -1363 +1363 @@
        print*,'iflag_coupl,iflag_clos,iflag_wake', &
             iflag_coupl,iflag_clos,iflag_wake
-       print*,'iflag_CYCLE_DIURNE', iflag_cycle_diurne
+       print*,'iflag_cycle_diurne', iflag_cycle_diurne
        !
        IF (iflag_con.EQ.2.AND.iflag_cld_th.GT.-1) THEN

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/printflag.F90

@@ -30 +30 @@
     &  ************'
   PRINT 100
-  PRINT 10, cycle_diurne, soil_model
+  PRINT 10, iflag_cycle_diurne.GE.1, soil_model
   PRINT 100
 
@@ -97 +97 @@
   END IF
 
-  IF (cycle_diurn0 .AND. .NOT. cycle_diurne .OR. .NOT. cycle_diurn0 .AND. &
-      cycle_diurne) THEN
-    PRINT 13, cycle_diurn0, cycle_diurne
+  IF (cycle_diurn0 .AND. .NOT. (iflag_cycle_diurne.GE.1) .OR. .NOT. cycle_diurn0 .AND. &
+      (iflag_cycle_diurne.GE.1) ) THEN
+    PRINT 13, cycle_diurn0, iflag_cycle_diurne
     PRINT 100
   END IF

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/surf_ocean_mod.F90

@@ +1 @@
+
 !
 ! $Id$
@@ -185 +186 @@
 !--old parametrizations of ocean surface albedo
 !
-    IF (cycle_diurne) THEN
+    IF (iflag_cycle_diurne.GE.1) THEN
 !
        CALL alboc_cd(rmu0,alb_eau)