Changeset 2720 for LMDZ5/branches/testing/libf/dyn3dmem

Timestamp:

Nov 30, 2016, 1:28:41 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2664:2719 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/conf_gcm.F90 (modified) (3 diffs)
• libf/dyn3dmem/logic_mod.F90 (modified) (1 diff)

LMDZ5/branches/testing/libf/dyn3dmem/conf_gcm.F90

@@ -22 +22 @@
   USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
                        ok_guide, ok_limit, ok_strato, purmats, read_start, &
-                       ysinus
+                       ysinus, read_orop
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                        alphax,alphay,taux,tauy
@@ -929 +929 @@
      CALL getin('ok_etat0',ok_etat0)
 
+     !Config  Key  = read_orop
+     !Config  Desc = lecture du fichier de params orographiques sous maille
+     !Config  Def  = f
+     !Config  Help = lecture fichier plutot que grid_noro
+
+     read_orop = .FALSE.
+     CALL getin('read_orop',read_orop)
+
      write(lunout,*)' #########################################'
      write(lunout,*)' Configuration des parametres de cel0' &
@@ -977 +985 @@
      write(lunout,*)' ok_limit = ', ok_limit
      write(lunout,*)' ok_etat0 = ', ok_etat0
+     write(lunout,*)' read_orop = ', read_orop
   end IF test_etatinit
 

LMDZ5/branches/testing/libf/dyn3dmem/logic_mod.F90

@@ -25 +25 @@
   LOGICAL ok_strato
   LOGICAL ok_gradsfile
-  LOGICAL ok_limit
-  LOGICAL ok_etat0
+  LOGICAL ok_limit  ! true for boundary conditions file creation (limit.nc)
+  LOGICAL ok_etat0  ! true for initial states creation (start.nc, startphy.nc)
+  LOGICAL read_orop ! true for sub-cell scales orographic params read in file
   LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
                  ! (only used if disvert_type==2)