Changeset 3505 for CONFIG/UNIFORM/v6/LMDZOR_v6

Timestamp:

12/13/17 09:13:26 (6 years ago)

Author:

jgipsl

Message:

Updated LMDZOR_v6 for modifications related to CMIP6 workflow as done in earlier commits in IPSLCM6.

Location:

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL

Files:

• DRIVER/lmdz.driver (modified) (3 diffs)
• DRIVER/orchidee.driver (modified) (1 diff)
• DRIVER/stomate.driver (modified) (1 diff)
• PARAM/iodef.xml (modified) (1 diff)

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

@@ -53 +53 @@
     ok_hf3hm=.FALSE.
     ok_stn=.FALSE.
+
 
     case ${config_UserChoices_PeriodLength} in
@@ -80 +81 @@
     done
 
-    ##  Read LMDZ_COSP_OK in lmdz.card
+    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+        ok_mensuel=.FALSE.
+        ok_journe=.FALSE.
+        ok_hf=.FALSE.
+        ok_hf3h=.FALSE.
+        ok_hf3hm=.FALSE.
+        ok_stn=.FALSE.
+    fi
+
+##  Read LMDZ_COSP_OK in lmdz.card
     if [ X${lmdz_UserChoices_LMDZ_COSP_OK} = Xy ] ; then
         ##  LMDZ_COSP_OK=y, now read all other COSP variables
@@ -456 +466 @@
     #  <context id="LMDZ" src="./context_lmdz.xml"/>
     echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+        echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp
+        echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp
+    fi
     cp iodef.xml iodef.xml.tmp
     sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml

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

@@ -135 +135 @@
     #  <context id="orchidee" src="./context_orchidee.xml"/>
     echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp
+    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
+    fi
     cp iodef.xml iodef.xml.tmp
     sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml

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

@@ -45 +45 @@
     done
 
+    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then       
+        stomate_enabled=.FALSE.
+    fi
+
     # Modify file_def_orchidee.xml
     IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled ${stomate_enabled}

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/iodef.xml

@@ -15 +15 @@
     <variable_definition>       
       <variable id="optimal_buffer_size" type="string">performance</variable>
-      <variable id="buffer_size_factor" type="double">1.5</variable>
+      <variable id="buffer_size_factor" type="double">1.0</variable>
       <variable id="min_buffer_size" type="int">10000000</variable>
       <variable id="info_level"            type="int">1</variable>