Changeset 6291 for CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/DRIVER/orchidee.driver

Timestamp:

12/21/22 16:34:17 (19 months ago)

Author:

aclsce

Message:

• Merge in ICOLMDZOR_LAM configuration accordingly with ICOLMDZOR configuration :

compilation : added rad option (with correct handling of svn test version)
experiments : merge with LMDZOR_v6.2 configuration
cleaning and other small things

File:

• CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/DRIVER/orchidee.driver (modified) (3 diffs)

CONFIG/UNIFORM/v7/ICOLMDZOR_LAM_v7/GENERAL/DRIVER/orchidee.driver

@@ -42 +42 @@
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo
-
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE.
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo
-
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE.
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0
-        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo
     fi
 
@@ -70 +71 @@
     else
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
+    fi
+
+    # Set parameters related to ROUTING in orchidee.def
+    if [ X${orchidee_UserChoices_ROUTING} = X ] || [ X${orchidee_UserChoices_ROUTING} = Xstandard ]; then
+        # Nothing is set or ROUTING=standard in orchidee.def, default option
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard
+    elif [ X${orchidee_UserChoices_ROUTING} = Xsimple ]; then
+        # ROUTING=simple is set in orchidee.card
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  simple
+    elif [ X${orchidee_UserChoices_ROUTING} = Xhighres ]; then
+        # ROUTING=highres is set in orchidee.card
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  highres
+    else
+        # ROUTING=off, routing will be deactivated
+        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING n
+        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard
     fi
 
@@ -162 +182 @@
         echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp
     fi
+
+    # Add inclusion of file context_routing_orchidee.xml if this file exists
+    if [ -f context_routing_orchidee.xml ] ; then
+        echo '<context id="orchidee" src="./context_routing_orchidee.xml"/>' >> add.tmp
+    fi
+
     # Include xml files for output configuration if running with workflow CMIP6
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
-        echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp
-        echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
+          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp
+          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp
     fi
     cp iodef.xml iodef.xml.tmp