Changeset 5117 for CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL

Timestamp:

06/18/20 17:26:34 (4 years ago)

Author:

aclsce

Message:

Added functionality to use "CMIP6 light workflow" by activating dr2xmlIPSL variable in config.card.

Location:

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL

Files:

• DRIVER/lmdz.driver (modified) (1 diff)
• DRIVER/opa9.driver (modified) (1 diff)
• DRIVER/orchidee.driver (modified) (1 diff)
• DRIVER/xios.driver (modified) (1 diff)
• PARAM/dr2xml_IPSL_LMDZ.xml (added)
• PARAM/dr2xml_IPSL_nemo.xml (added)
• PARAM/dr2xml_IPSL_orchidee.xml (added)

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/lmdz.driver

@@ -554 +554 @@
     fi
     # Include xml files for output configuration if running with workflow CMIP6
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
         echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp
-        echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp
+    echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp
     fi
     cp iodef.xml iodef.xml.tmp

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/opa9.driver

@@ -262 +262 @@
     #  <context id="nemo" src="./context_nemo.xml"/>
     echo '<context id="nemo" src="./context_nemo.xml"/>' > add.tmp
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
-        echo '<context id="nemo" src="./ping_nemo.xml"/>' >> add.tmp
-        echo '<context id="nemo" src="./dr2xml_opa9.xml"/>' >> add.tmp
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
+      echo '<context id="nemo" src="./ping_nemo.xml"/>' >> add.tmp
+          echo '<context id="nemo" src="./dr2xml_opa9.xml"/>' >> add.tmp
     fi
     cp iodef.xml iodef.xml.tmp

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/orchidee.driver

@@ -147 +147 @@
     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

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/xios.driver

@@ -20 +20 @@
 
 # Activate 2nd server level for CMIP6 type experiments (CMIP6 workflow)
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X"$( echo ${config_UserChoices_ExpType} | grep MR025 )" != "X" ] ; then
+
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X"$( echo ${config_UserChoices_ExpType} | grep MR025 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
        IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true
     fi