Changeset 4108

Timestamp:

11/05/18 13:09:27 (5 years ago)

Author:

jgipsl

Message:

If file context_input_lmdz.xml or context_input_orchidee.xml exit, include it in iodef.xml.

Location:

CONFIG/UNIFORM/v6

Files:

• IPSLCM6/GENERAL/DRIVER/lmdz.driver (modified) (1 diff)
• IPSLCM6/GENERAL/DRIVER/orchidee.driver (modified) (1 diff)
• LMDZOR_v6/GENERAL/DRIVER/lmdz.driver (modified) (1 diff)
• LMDZOR_v6/GENERAL/DRIVER/orchidee.driver (modified) (1 diff)

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

@@ -528 +528 @@
 
     # Add include of LMDZ context in iodef.xml
-    # In iodef.xml add on next line after "COMPONENT CONTEXT"
-    #  <context id="LMDZ" src="./context_lmdz.xml"/>
+    # In iodef.xml add on the next line after "COMPONENT CONTEXT"
     echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    # Add inclusion of file context_input_lmdz.xml if this file exists
+    if [ -f context_input_lmdz.xml ] ; then
+        echo '<context id="LMDZ" src="./context_input_lmdz.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="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp

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

@@ -131 +131 @@
 
     # Add include of orchidee context in iodef.xml
-    # In iodef.xml add on next line after "COMPONENT CONTEXT"
-    #  <context id="orchidee" src="./context_orchidee.xml"/>
+    # 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
+    # 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

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

@@ -528 +528 @@
 
     # Add include of LMDZ context in iodef.xml
-    # In iodef.xml add on next line after "COMPONENT CONTEXT"
-    #  <context id="LMDZ" src="./context_lmdz.xml"/>
+    # In iodef.xml add on the next line after "COMPONENT CONTEXT"
     echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    # Add inclusion of file context_input_lmdz.xml if this file exists
+    if [ -f context_input_lmdz.xml ] ; then
+        echo '<context id="LMDZ" src="./context_input_lmdz.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="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp

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

@@ -131 +131 @@
 
     # Add include of orchidee context in iodef.xml
-    # In iodef.xml add on next line after "COMPONENT CONTEXT"
-    #  <context id="orchidee" src="./context_orchidee.xml"/>
+    # 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
+    # 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