Changeset 4682 for CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

Timestamp:

08/28/19 16:37:56 (5 years ago)

Author:

jgipsl

Message:

Updated as done in IPSLCM6.1.10-LR : new file file_def_histdaystrataer_lmdz.xml and ok_volcan became AUTO.

File:

• CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver (modified) (3 diffs)

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

@@ -322 +322 @@
     IGCM_comp_modifyXmlFile nonblocker file_def_histhfCOSP_lmdz.xml histhfCOSP enabled ${LMDZ_COSP_hf}
 
-    # Activate the histstrataer output file only for configuration with interactive stratospheric aersols 
+    # Activate the histstrataer output files only for configuration with interactive stratospheric aerosols 
     # done by setting the key word LMDZ_strataero=y in lmdz.card
     if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
         IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .TRUE.
+    IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .TRUE.
     else
         IGCM_comp_modifyXmlFile nonblocker file_def_histstrataer_lmdz.xml histstrataer enabled .FALSE.
+    IGCM_comp_modifyXmlFile nonblocker file_def_histdaystrataer_lmdz.xml histdaystrataer enabled .FALSE.
     fi
 
@@ -391 +393 @@
 
     if [ X${config_ListOfComponents_CHM} = Xinca ] ; then
-        echo "Activate coupling to INCA, set type_trac=inca in run.def"
-        IGCM_comp_modifyDefFile blocker run.def type_trac inca
+    echo "Activate coupling to INCA, set type_trac=inca in run.def"
+    IGCM_comp_modifyDefFile blocker run.def type_trac inca
     elif [ X${config_ListOfComponents_CHM} = Xreprobus ] ; then
-        echo "Activate coupling to REPROBUS, set type_trac=repr in run.def"
-        IGCM_comp_modifyDefFile blocker run.def type_trac repr
+    echo "Activate coupling to REPROBUS, set type_trac=repr in run.def"
+    IGCM_comp_modifyDefFile blocker run.def type_trac repr
         IGCM_comp_modifyDefFile blocker run.def config_inca none
-    else
-        echo "No coupling to chemistry model, set type_trac=lmdz in run.def"
-        IGCM_comp_modifyDefFile blocker run.def type_trac lmdz
+    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
+        echo "No coupling to chemistry model but it is a LMDZ STRATAER configuration, set type_trac=coag in run.def"
+        IGCM_comp_modifyDefFile blocker run.def type_trac coag
         IGCM_comp_modifyDefFile blocker run.def config_inca none
-    fi
-
+    else
+    echo "No coupling to chemistry model, set type_trac=lmdz in run.def"
+    IGCM_comp_modifyDefFile blocker run.def type_trac lmdz
+        IGCM_comp_modifyDefFile blocker run.def config_inca none
+    fi
 
     # run.def : Activate the call to phytrac 
     if [ ! X${lmdz_UserChoices_iflag_phytrac} = X ]; then 
         IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac ${lmdz_UserChoices_iflag_phytrac}
+    elif [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
+    IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac 1
     else
         IGCM_comp_modifyDefFile nonblocker run.def iflag_phytrac 0
@@ -483 +490 @@
         IGCM_comp_modifyDefFile nonblocker config.def pmagic DEFAULT
     fi 
+
+    # config.def : Modify parameter ok_volcan if it is set in lmdz.card
+    if [ ! X${lmdz_UserChoices_ok_volcan} = X ]; then
+    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan ${lmdz_UserChoices_ok_volcan}
+    else
+    # Take default value set in config.def
+    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT
+    fi
+
+    # config.def : set ok_volcan to y if we are in the strataero config
+    if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
+    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan y
+    else
+    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT
+    fi
+
+    # Note: ok_volcan is a flag allowing a double-call with/without natural forcing (instead of with/without anthro forcing).
 
     # physiq.def : Modify parameter tau_gl if it is set in lmdz.card