Changeset 4672 for CONFIG/UNIFORM

Timestamp:

08/22/19 11:14:46 (5 years ago)

Author:

tlurton

Message:

Added new STRATAER historical experiment.

Location:

CONFIG/UNIFORM/v6/IPSLCM6

Files:

• EXPERIMENTS/IPSLCM/historical_STRATAER (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/lim2.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/lim3.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/lmdz.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/oasis.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/opa9.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/orchidee.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/pisces.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/stomate.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/COMP/xios.card (added)
• EXPERIMENTS/IPSLCM/historical_STRATAER/config.card (added)
• GENERAL/DRIVER/lmdz.driver (modified) (3 diffs)
• GENERAL/PARAM/config.def_actuel (modified) (1 diff)
• GENERAL/PARAM/config.def_annuel (modified) (1 diff)
• GENERAL/PARAM/config.def_preind (modified) (1 diff)
• GENERAL/PARAM/gcm.def_144x142_NPv6.1_strataer (added)
• GENERAL/PARAM/namelist_ORCA1_STRATAER_cfg (added)
• GENERAL/PARAM/namelist_lim3_ORCA1_cfg_NPv6.1_strataer (added)
• GENERAL/PARAM/physiq.def_NPv6.1_strataer (added)
• GENERAL/PARAM/traceur.def_strataer (added)

CONFIG/UNIFORM/v6/IPSLCM6/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
@@ -393 +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
@@ -485 +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

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/config.def_actuel

@@ -73 +73 @@
 # Aerosols stratospheriques utilises par defaut 
 flag_aerosol_strat=2
-# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones
-ok_volcan=n
+# Flag to yield double call with/without natural forcing (instead of with/without anthropic)
+ok_volcan=_AUTO_: DEFAULT = n
 #
 # COSP

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/config.def_annuel

@@ -74 +74 @@
 # Aerosols stratospheriques utilises par defaut 
 flag_aerosol_strat=2
-# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones
-ok_volcan=n
+# Flag to yield double call with/without natural forcing (instead of with/without anthropic)
+ok_volcan=_AUTO_: DEFAULT = n
 #
 # COSP

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/config.def_preind

@@ -74 +74 @@
 #
 flag_aerosol_strat=2
-# Diag VolMIP to get volcanic aerosols effects instead of tropospheric ones
-ok_volcan=n
+# Flag to yield double call with/without natural forcing (instead of with/without anthropic)
+ok_volcan=_AUTO_: DEFAULT = n
+#
 #
 # COSP