Changeset 5644 for CONFIG

Timestamp:

03/24/21 10:44:53 (3 years ago)

Author:

tlurton

Message:

Added and modified necessary files to support configuration CO2AER.

Location:

CONFIG/UNIFORM/v6/IPSLCM6.2

Files:

• EXPERIMENTS/IPSLESM/CO2AER (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/inca.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/lim2.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/lim3.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/lmdz.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/oasis.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/opa9.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/orchidee.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/pisces.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/stomate.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/COMP/xios.card (added)
• EXPERIMENTS/IPSLESM/CO2AER/piControl_CO2AER_TEST/config.card (added)
• GENERAL/DRIVER/lmdz.driver (modified) (3 diffs)
• GENERAL/DRIVER/pisces.driver (modified) (2 diffs)
• GENERAL/PARAM/namcouple_ESMCO2AER_ORCA1xLMD144142 (added)
• GENERAL/PARAM/namelist_ESMCO2AER_ORCA1_cfg (added)
• GENERAL/PARAM/namelist_pisces_ESMCO2AER_ORCA1_cfg (added)
• GENERAL/PARAM/namelist_top_ESMCO2AER_ORCA1piC_cfg (added)
• GENERAL/PARAM/traceur.def_ESMCO2AER (added)
• compile_ipslcm6.sh (modified) (3 diffs)

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/lmdz.driver

@@ -367 +367 @@
     fi
 
-    if [ X${config_ListOfComponents_CHM} = Xinca ] ; then
+    if [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ; then
+    echo "ESM config, with INCA and CO2i, set type_trac=inco in run.def"
+    IGCM_comp_modifyDefFile blocker run.def type_trac inco
+    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1
+    elif [ 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
@@ -380 +384 @@
         IGCM_comp_modifyDefFile blocker run.def type_trac co2i
         IGCM_comp_modifyDefFile blocker run.def config_inca none
-        IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
+    IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1 
     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"
@@ -480 +484 @@
     fi 
 
-    if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then
         # Set carbon cycle parameters according to parmeters in lmdz.card 
         IGCM_comp_modifyDefFile blocker config.def level_coupling_esm 2 

CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/pisces.driver

@@ -85 +85 @@
     IGCM_comp_modifyNamelist force  namelist_pisces_cfg atcco2 ${LMDZ_CO2}
 
-    if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then
         ##-- N2O forcing : update atcn2o value in namelist_pisces_cfg with the same one used in LMDZ
         IGCM_debug_Print 1 "Take same N2O as for LMDZ, in parameter file config.def."
@@ -115 +115 @@
     IGCM_comp_modifyXmlFile nonblocker file_def_nemo-pisces.xml 1y_pis output_level ${pisces_UserChoices_OutputLevel}
 
-    if [ X${config_UserChoices_ConfigType} = XESMCO2 ] ; then
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] || [ X${config_UserChoices_ConfigType} = XESMCO2AER ] ) ; then
       # Output file with PISCES gas variables
       IGCM_comp_modifyXmlFile force file_def_nemo-pisces.xml file41 enabled .TRUE.

CONFIG/UNIFORM/v6/IPSLCM6.2/compile_ipslcm6.sh

@@ -68 +68 @@
          [ESMCO2] Compile IPSLCM6 for CO2 interactif ocean/atmosphere.
          [ESMAER] Compile IPSLCM6 for AER interactif on atmosphere
+         [ESMCO2AER] Compile IPSLCM6 for both interactive CO2 and AER.
          [-full] Full recompilation of all components. This option can be added to all other options.
          [-cleannemo] Full recompilation of NEMO component  only.
@@ -101 +102 @@
         "ESMCO2")      esmco2=y;  shift ;; 
         "ESMAER")      esmaer=y; shift ;; 
+        "ESMCO2AER")   esmco2=y; esmaer=y; shift ;;
         "CE0L")        ce0l=y ; shift ;;
         "-parallel")   parallel=$2 ; shift ; shift ;; 
@@ -320 +322 @@
 
 if [ -f $nemo_root/$cfg_wrk/BLD/bin/nemo.exe ] ; then
-    if [ ${esmco2} == y ] ;  then 
+    if [ ${esmco2} == y ] && [ ${esmaer} == n ] ;  then 
         mv $nemo_root/$cfg_wrk/BLD/bin/nemo.exe $modipsl/bin/opa.ESMCO2_${resol_oce}_${optmode}
+    elif [ ${esmco2} == y ] && [ ${esmaer} == y ] ;  then
+    mv $nemo_root/$cfg_wrk/BLD/bin/nemo.exe $modipsl/bin/opa.ESMCO2AER_${resol_oce}_${optmode}
     else
         mv $nemo_root/$cfg_wrk/BLD/bin/nemo.exe $modipsl/bin/opa_${resol_oce}_${optmode}