Changeset 1692 for CONFIG/UNIFORM/u1/LMDZOR_u1

Timestamp:

03/20/12 09:36:08 (12 years ago)

Author:

jgipsl

Message:

Changed to _AUTO_ all variables that will be modified by the orchidee.driver or stomate.driver. Added, where missing, "else ORCHIDEE_sed..." to set default values.

Location:

CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL

Files:

• DRIVER/orchidee.driver (modified) (2 diffs)
• DRIVER/stomate.driver (modified) (1 diff)
• PARAM/orchidee.def (modified) (11 diffs)

CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/DRIVER/orchidee.driver

@@ -93 +93 @@
 
     # Outputs HF in HISTFILE2 if required
-    [ X${SRF_ok_hf} = Xy ] && ORCHIDEE_sed SECHIBA_HISTFILE2 y
+    if [ X${SRF_ok_hf} = Xy ] ; then
+        ORCHIDEE_sed SECHIBA_HISTFILE2 y
+    else
+        ORCHIDEE_sed SECHIBA_HISTFILE2 n
+    fi
     ORCHIDEE_sed SECHIBA_HISTLEVEL2 1
     ORCHIDEE_sed WRITE_STEP2 10800.0
@@ -99 +103 @@
     if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then
         ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc
+    else
+        ORCHIDEE_sed SECHIBA_restart_in NONE
     fi
-
 
 # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices
     if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then
         ORCHIDEE_sed VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE}
+    else
+        ORCHIDEE_sed VEGET_UPDATE 0Y
     fi
     if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then
         ORCHIDEE_sed LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE}
+    else
+        ORCHIDEE_sed LAND_COVER_CHANGE n
     fi
 

CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/DRIVER/stomate.driver

@@ -71 +71 @@
     if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then
         echo "STOMATE : without restart"
+        ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE
     else
         ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc

CONFIG/UNIFORM/u1/LMDZOR_u1/GENERAL/PARAM/orchidee.def

@@ -102 +102 @@
 #  Not truly COADS compliant. NONE will mean that
 #  no restart file is to be expected.
-SECHIBA_restart_in = NONE
+SECHIBA_restart_in = _AUTO_
 # default = NONE
 
@@ -118 +118 @@
 # This is the name of the file which will be opened of STOMATE
 #   to extract the initial values of all prognostic values of STOMATE.
-STOMATE_RESTART_FILEIN = NONE
+STOMATE_RESTART_FILEIN = _AUTO_
 # default = NONE
 
@@ -203 +203 @@
 #  frequency writing. This second output is optional and not written
 #  by default.
-SECHIBA_HISTFILE2 = FALSE
+SECHIBA_HISTFILE2 = _AUTO_
 # default  = FALSE
 
@@ -231 +231 @@
 #  written are available More details can be found on the web under documentation.
 #  web under documentation.
-SECHIBA_HISTLEVEL = 5
+SECHIBA_HISTLEVEL = _AUTO_
 # default = 5
 
@@ -241 +241 @@
 #   web under documentation.
 # First level contains all ORCHIDEE outputs.
-SECHIBA_HISTLEVEL2 = 1
+SECHIBA_HISTLEVEL2 = _AUTO_
 # default = 1
 
 # STOMATE history output level (0..10)
 #  0: nothing is written; 10: everything is written
-STOMATE_HISTLEVEL = 10
+STOMATE_HISTLEVEL = _AUTO_
 # default = 10
 
@@ -275 +275 @@
 #  It does not affect the frequency at which the
 #  operations such as averaging are done.
-WRITE_STEP = 86400.0
+WRITE_STEP = _AUTO_
 # default = 86400.0
 
@@ -286 +286 @@
 #   That is IF the coding of the calls to histdef
 #   are correct !
-WRITE_STEP2 = 1800.0
+WRITE_STEP2 = _AUTO_
 # default = 1800.0
 
@@ -292 +292 @@
 # Time step of the STOMATE history file
 # Care : this variable must be higher than DT_SLOW
-STOMATE_HIST_DT = 10.
+STOMATE_HIST_DT = _AUTO_
 # default = 10.
 
@@ -743 +743 @@
 # The veget datas will be update each this time step.
 # If LAND_USE
-VEGET_UPDATE = 0Y
+VEGET_UPDATE = _AUTO_
 # default = 1Y
 
@@ -751 +751 @@
 # deforestation.                                
 # If LAND_USE
-LAND_COVER_CHANGE = n
+LAND_COVER_CHANGE = _AUTO_
 # default = y
 
@@ -803 +803 @@
 #  diffusion scheme adapted from CWRR by Patricia de Rosnay.
 #  by default the Choisnel hydrology is used.
-HYDROL_CWRR = n
+HYDROL_CWRR = _AUTO_
 # default = n