Changeset 6290 for CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver

Timestamp:

12/21/22 15:49:31 (19 months ago)

Author:

aclsce

Message:

• Finalized merge in ICOLMDZOR configuration :
  • compilation : added rad option (with correct handling of svn test version)
  • experiments : merge with LMDZOR_v6.2 configuration, handling of remap frequency for ORCHIDEE xml file_def
  • cleaning and other small things

File:

• CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver (modified) (5 diffs)

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

@@ -382 +382 @@
     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
-        IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1
+        IGCM_comp_modifyDefFile blocker run.def iflag_phytrac 1  
     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
         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${config_UserChoices_ConfigType} = XESMCO2 ] ; then 
         echo "ESM config, set type_trac=co2i in run.def"
         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"
@@ -495 +499 @@
     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 
@@ -501 +505 @@
         IGCM_comp_modifyDefFile blocker config.def carbon_cycle_tr ${lmdz_UserChoices_carbon_cycle_tr}
         IGCM_comp_modifyDefFile blocker config.def carbon_cycle_rad ${lmdz_UserChoices_carbon_cycle_rad}
+        IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 ${lmdz_UserChoices_co2_ppm0} 
     else
         # Take default value set in config.def
@@ -507 +512 @@
         IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_tr DEFAULT
         IGCM_comp_modifyDefFile nonblocker config.def carbon_cycle_rad DEFAULT
+        IGCM_comp_modifyDefFile nonblocker config.def co2_ppm0 DEFAULT
+    fi
+
+    if ( [ X${config_UserChoices_ConfigType} = XESMCO2 ] ) ; then
+        # Set carbon cycle parameters according to parmeters in lmdz.card 
+        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor ${lmdz_UserChoices_read_fco2_ocean_cor}
+        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor ${lmdz_UserChoices_var_fco2_ocean_cor}
+        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor ${lmdz_UserChoices_read_fco2_land_cor}
+        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor ${lmdz_UserChoices_var_fco2_land_cor}
+    else
+        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_ocean_cor DEFAULT
+        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_ocean_cor DEFAULT
+        IGCM_comp_modifyDefFile nonblocker config.def read_fco2_land_cor DEFAULT
+        IGCM_comp_modifyDefFile nonblocker config.def var_fco2_land_cor DEFAULT
     fi
 
@@ -577 +596 @@
     fi
     # Include xml files for output configuration if running with workflow CMIP6
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then
         echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp
         echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp