Changeset 7427 for branches

Timestamp:

2022-01-12T12:12:15+01:00 (3 years ago)

Author:

agnes.ducharne

Message:

Final corrections to FG2nd and FG3nd configurations for the new driver. FG2nd works at 2deg, but not yet at 0.5deg, cf ticket #786.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE_OL

Files:

• OOL_SEC_STO_FG2nd/COMP/sechiba.driver (modified) (2 diffs)
• OOL_SEC_STO_FG2nd/COMP/stomate.driver (modified) (1 diff)
• OOL_SEC_STO_FG2nd/PARAM/run.def (modified) (1 diff)
• OOL_SEC_STO_FG3nd/PARAM/run.def (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG2nd/COMP/sechiba.driver

@@ -80 +80 @@
     SECHIBA_WRITE_STEP2=0
 
-    if [ X${orchidee_ol_UserChoices_XIOS} = Xy ] ; then
+    if [ X${orchideedriver_UserChoices_XIOS} = Xy ] ; then
       # Activate XIOS output
       IGCM_comp_modifyDefFile blocker run.def XIOS_ORCHIDEE_OK y
@@ -147 +147 @@
     # Modify file_def_orchidee.xml if XIOS is activated
     # Settings in config.card WriteFrequency are not used any more. The section above is only used for IOIPSL.
-    if [ X${orchidee_ol_UserChoices_XIOS} = Xy ] ; then
+    if [ X${orchideedriver_UserChoices_XIOS} = Xy ] ; then
         # Modify file_def_orchidee.xml file using settings from sechiba.card/orchidee.card
         # We here suppose that for each file, in sechiba.card/orchidee.card UserChoices section, if the parameter 

branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG2nd/COMP/stomate.driver

@@ -47 +47 @@
     # Modify file_def_orchidee.def if XIOS is activated using information in stomate.card
     # Settings in config.card WriteFrequency are not used any more.
-    if [ X${orchidee_ol_UserChoices_XIOS} = Xy ] ; then
+    if [ X${orchideedriver_UserChoices_XIOS} = Xy ] ; then
 
         # Modify file_def_orchidee.xml file using settings from stomate.card

branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG2nd/PARAM/run.def

@@ -14 +14 @@
 #**************************************************************************
 
-# For new driver with CRUJRA2.2 (SPREAD_PREC8SEC=half forcing timestep by default)
+# For new driver with CRUJRA2.2 (SPREAD_PREC_SEC=half forcing timestep by default)
 #*****************************************************************************
+START_DATE = _AUTO_
+END_DATE = _AUTO_
 DT_SECHIBA = 1800
+#SPREAD_PREC_SEC = 3600 # The default is half the forcing time step
+FORCING_FILE = forcing_yearm1.nc forcing_year.nc forcing_yearp1.nc
 GRID_FILE = NONE
+#WEST_EAST = -180.0, 180.0
+#SOUTH_NORTH = -90.0, 90.0
 # Deactivate river routing as not working with CRUJRA (default y)
 RIVER_ROUTING = n
+#*****************************************************************************
 
 # Activate Stomate component (default y)

branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG3nd/PARAM/run.def

@@ -14 +14 @@
 #**************************************************************************
 
-# Activate Stomate component (default y)
-STOMATE_OK_STOMATE = _AUTOBLOCKER_ 
-
-# Time length for one intergration (default full lenght of forcing file)
+# For new driver with CRUJRA2.2 (SPREAD_PREC_SEC=half forcing timestep by default)
+#*****************************************************************************
 START_DATE = _AUTO_
-END_DATE = _AUTO_ 
+END_DATE = _AUTO_
 DT_SECHIBA = 1800
-#FORCING_FILE = forcing_yearm1.nc forcing_year.nc forcing_yearp1.nc
-#
-# Domain description file
-#
+#SPREAD_PREC_SEC = 3600 # The default is half the forcing time step
+FORCING_FILE = forcing_yearm1.nc forcing_year.nc forcing_yearp1.nc
 GRID_FILE = NONE
 #WEST_EAST = -180.0, 180.0
 #SOUTH_NORTH = -90.0, 90.0
-#SPREAD_PREC_SEC = 3600 # The default is half the forcing time step
+#*****************************************************************************
+
+# Activate Stomate component (default y)
+STOMATE_OK_STOMATE = _AUTOBLOCKER_ 
 
 #