Changeset 4217 for CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER

Timestamp:

01/11/19 14:27:49 (5 years ago)

Author:

cpipsl

Message:

IPSLESM6: update of GENERAL directory up to CM6.1.8 configuration

Location:

CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER

Files:

• lmdz.driver (modified) (2 diffs)
• orchidee.driver (modified) (1 diff)
• pisces.driver (modified) (1 diff)

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

@@ -489 +489 @@
     else
         # Take default value set in physiq.def
-        IGCM_comp_modifyDefFile nonblocker config.def tau_gl DEFAULT
+        IGCM_comp_modifyDefFile nonblocker physiq.def tau_gl DEFAULT
     fi
    
@@ -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/IPSLESM6/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/IPSLESM6/GENERAL/DRIVER/pisces.driver

@@ -81 +81 @@
     # ATM_Update is done before MBG_Update and therefore config.def file contains the correct value for CO2.
     IGCM_debug_Print 1 'Update atcco2 in namelist_pisces_cfg with same value as for LMDZ'
-    LMDZ_CO2=$( lmdzgrep2 co2_ppm config.def )
+    LMDZ_CO2=$( lmdzgrep2 co2_ppm config.def | head -1 )
     IGCM_debug_Print 1 "LMDZ_CO2 : ${LMDZ_CO2} "
     IGCM_comp_modifyNamelist force  namelist_pisces_cfg atcco2 ${LMDZ_CO2}