Changeset 6117 for CONFIG/UNIFORM/v6/LMDZOR_v6.4/GENERAL

Timestamp:

04/20/22 16:07:08 (2 years ago)

Author:

jgipsl

Message:

• Update orchidee.driver as done in LMDZOR_v6.2 to be easier to use with routing scheme simple. This is done in all configurations using ORCHIDEE_2_x, ORCHIDEE_3 and ORCHIDEE trunk.

• Update orchidee.def in configurations using ORCHIDEE_2_2 only. Only these configurations can activate routing simple currently. Now to activate routing simple, only modifications in orchidee.card is needed.

See also ticket ​https://forge.ipsl.jussieu.fr/orchidee/ticket/581

File:

• CONFIG/UNIFORM/v6/LMDZOR_v6.4/GENERAL/DRIVER/orchidee.driver (modified) (2 diffs)

CONFIG/UNIFORM/v6/LMDZOR_v6.4/GENERAL/DRIVER/orchidee.driver

@@ -62 +62 @@
     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
 
@@ -142 +161 @@
     # In iodef.xml add on the next line after "COMPONENT CONTEXT"
     echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp
+
     # Add inclusion of file context_input_orchidee.xml if this file exists
     if [ -f context_input_orchidee.xml ] ; then
         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" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then