Changeset 2665 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Oct 12, 2016, 2:53:20 PM (8 years ago)

Author:

dcugnet

Message:

• A (re)startphy.nc file (standard name: "startphy0.nc") can be read by ce0l to get land mask, so mask can be defined (in decreasing priority order) from: 1) "o2a.nc file" if this file is found 2) "startphy0.nc" if this file is found 3) "Relief.nc" otherwise
• Sub-cell scales parameters for orographic gravity waves can be read from file "oro_params.nc" if the configuration key "read_orop" is TRUE. The effect is to bypass the "grid_noro" routine in ce0l, so that any pre-defined mask (from o2a.nc or startphy0.nc) is then overwritten.
• The gcm stops if the "limit.nc" records number differs from the current year number of days. A warning is issued in case the gcm calendar does not match the time axis attribute "calendar" (if available) from the "limit.nc" file. This attribute is now added to the "limit.nc" time axis.
• Few simplifications in grid_noro
• Few parameters changes in acama_gwd and flott_gwd.
• Variable d_u can be saved in the outputs.

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• conf_gcm.F90 (modified) (3 diffs)
• logic_mod.F90 (modified) (1 diff)

LMDZ5/trunk/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/trunk/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)