Changeset 2238

Timestamp:

04/11/14 12:22:04 (10 years ago)

Author:

jgipsl

Message:

• Add iodef.xml adapted for forced mode in PARAM
• Add automatic inclusion of context in driver
• Add xml file in EXPERIMENT/LMDZOR/clim

Location:

CONFIG/UNIFORM/v6/LMDZOR_v6

Files:

• EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card (modified) (2 diffs)
• EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card (modified) (2 diffs)
• GENERAL/DRIVER/lmdz.driver (modified) (1 diff)
• GENERAL/DRIVER/orchidee.driver (modified) (1 diff)
• GENERAL/PARAM/iodef.xml (added)
• GENERAL/PARAM/orchidee.def_CWRR (modified) (1 diff)
• GENERAL/PARAM/orchidee.def_Choi (modified) (1 diff)

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card

@@ -90 +90 @@
         (${SUBMIT_DIR}/PARAM/guide.def, .), \
         (${SUBMIT_DIR}/PARAM/run.def, .), \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .)
+        (${SUBMIT_DIR}/PARAM/traceur.def, .), \
+        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\
+        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . )
 
 [RestartFiles]
@@ -97 +109 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml,field_def_lmdz.xml)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

@@ -27 +27 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)
+List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) ,\
+        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)
 
 [RestartFiles]
@@ -34 +37 @@
 
 [OutputText]
-List=   (out_orchidee, orchidee.def)
+List=   (out_orchidee, orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml)
 
 [OutputFiles]

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

@@ -497 +497 @@
         fi
     fi
+
+    # 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"/>
+    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    cp iodef.xml iodef.xml.tmp
+    sed -e "/COMPONENT CONTEXT/r add.tmp" \
+        iodef.xml.tmp > iodef.xml
+    rm iodef.xml.tmp add.tmp
+
 
     IGCM_debug_PopStack "ATM_Update"

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

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

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_CWRR

@@ -891 +891 @@
 # default = n
 
-#**************************************************************************
+# Use XIOS for writing diagnostics file
+# defulat = n
+XIOS_ORCHIDEE_OK=y
+#**************************************************************************

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_Choi

@@ -891 +891 @@
 # default = n
 
-#**************************************************************************
+# Use XIOS for writing diagnostics file
+# defulat = n
+XIOS_ORCHIDEE_OK=y
+#**************************************************************************