Changeset 4190

Timestamp:

12/13/18 11:56:52 (5 years ago)

Author:

jgipsl

Message:

Now take xml files for DYNAMICO from folder modeles/DYNAMICO/xml. The configuration, icluding previous commit [4189] can only be used with DYANMICO/trunk rev 793 or later.

Location:

CONFIG/UNIFORM/v7/ICOLMDZOR_v7

Files:

• EXPERIMENTS/DYNAMICO_LMDZ/clim_noleap/COMP/dynamicolmdz.card (modified) (3 diffs)
• GENERAL/DRIVER/dynamicolmdz.driver (modified) (1 diff)
• GENERAL/PARAM/field_def.xml (deleted)
• GENERAL/PARAM/filedef_dcmip2016.xml (deleted)
• GENERAL/PARAM/filedef_debug.xml (deleted)
• GENERAL/PARAM/icosa.xml (deleted)

CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/DYNAMICO_LMDZ/clim_noleap/COMP/dynamicolmdz.card

@@ -34 +34 @@
         (${SUBMIT_DIR}/PARAM/vert.def_L${RESOL_LLM}, vert.def),\
         (${SUBMIT_DIR}/PARAM/iodef.xml, .),\
-        (${SUBMIT_DIR}/PARAM/icosa.xml, .),\
-        (${SUBMIT_DIR}/PARAM/field_def.xml, .),\
-        (${SUBMIT_DIR}/PARAM/filedef_dcmip2016.xml, .),\
-        (${SUBMIT_DIR}/PARAM/filedef_debug.xml, .),\
+        (${MODIPSL}/modeles/DYNAMICO/xml/context_dynamico.xml, .),\
+        (${MODIPSL}/modeles/DYNAMICO/xml/field_def_dynamico.xml, .),\
+        (${MODIPSL}/modeles/DYNAMICO/xml/file_def_dynamico.xml, .),\
         (${MODIPSL}/modeles/LMDZ5/DefLists/context_lmdz.xml, .),\
         (${MODIPSL}/modeles/LMDZ5/DefLists/field_def_lmdz.xml, .),\
@@ -60 +59 @@
 
 [OutputText]
-List=   (config.def, earth_const.def, physiq.def, run.def, run_icosa.def, start.def, traceur.def, vert.def, context_lmdz.xml, file_def_histLES_lmdz.xml, file_def_histday_lmdz.xml, file_def_histhf_lmdz.xml, file_def_histmthNMC_lmdz.xml, filedef_dcmip2016.xml, iodef.xml, field_def.xml, file_def_histdayCOSP_lmdz.xml, file_def_histhfCOSP_lmdz.xml, file_def_histins_lmdz.xml, file_def_histmth_lmdz.xml, filedef_debug.xml, field_def_lmdz.xml, file_def_histdayNMC_lmdz.xml, file_def_histhfNMC_lmdz.xml, file_def_histmthCOSP_lmdz.xml,file_def_histstn_lmdz.xml,  icosa.xml, out_icosa_lmdz.exe.out*, out_icosa_lmdz.exe.err*, xios_client_*)
+List=   (config.def, earth_const.def, physiq.def, run.def, run_icosa.def, start.def, traceur.def, vert.def, context_lmdz.xml, file_def_histLES_lmdz.xml, file_def_histday_lmdz.xml, file_def_histhf_lmdz.xml, file_def_histmthNMC_lmdz.xml, iodef.xml, context_dynmico.xml, field_def_dynamico.xml, file_def_dynamico.xml, file_def_histdayCOSP_lmdz.xml, file_def_histhfCOSP_lmdz.xml, file_def_histins_lmdz.xml, file_def_histmth_lmdz.xml, field_def_lmdz.xml, file_def_histdayNMC_lmdz.xml, file_def_histhfNMC_lmdz.xml, file_def_histmthCOSP_lmdz.xml,file_def_histstn_lmdz.xml,  out_icosa_lmdz.exe.out*, out_icosa_lmdz.exe.err*, xios_client_*)
 
 
@@ -74 +73 @@
         (histhfNMC.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,     NONE),                  \
         (histhf3h.nc,      ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,      NONE),                  \
-        (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE)
+        (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE),                  \
+        (output_dcmip2016_native.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_3H_output_dcmip2016_native.nc,     NONE), \
+        (output_dcmip2016_regular.nc,   ${R_OUT_ATM_O_H}/${PREFIX}_3H_output_dcmip2016_regular.nc,    NONE)
 
 

CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/dynamicolmdz.driver

@@ -88 +88 @@
     fi
 
+
+
+    # Add include of context xml files for LMDZ and DYNAMICO in iodef.xml
+    # In iodef.xml add on the next line after "COMPONENT CONTEXT"
+    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp
+    echo '<context id="icosagcm" src="./context_dynamico.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
+    # Add inclusion of file context_input_dynamico.xml if this file exists
+    if [ -f context_input_dynamico.xml ] ; then
+        echo '<context id="icosagcm" src="./context_input_dynamico.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
+      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
+    rm iodef.xml.tmp add.tmp
+
+    # Add a Long Name as global attribute in output files if LongName is set in config.card
+    if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then
+      listfile=$(ls file_def*lmdz.xml)
+      echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp
+      for file in ${listfile} ; do
+          cp ${file} ${file}.tmp
+          sed -e "/<file id/r add.tmp" \
+          ${file}.tmp > ${file}
+          rm ${file}.tmp 
+      done
+      rm add.tmp
+    fi
+
+
     IGCM_debug_PopStack "ATM_Update"
 }