Changeset 3055

Timestamp:

12/14/16 09:18:12 (7 years ago)

Author:

jgipsl

Message:

Changed greenhouse gazes to use new CMIP6 forcing files. Note the file SOLARANDVOLCANOES.txt is still kept with the CMIP5 values. This file is only used for the case with old physics, when ok_suntime_rrtm=n.

Location:

CONFIG/UNIFORM/v6

Files:

• IPSLCM6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card (modified) (1 diff)
• LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card (modified) (1 diff)
• propagate_master_config.ksh (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

@@ -65 +65 @@
         (${R_IN}/ATM/STRATAERO/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/tauswstrat.2D.${year}.nc, tauswstrat.2D.nc)
 
-ListNonDel= (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CO2_1765_2005.txt, CO2.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CH4_1765_2005.txt, CH4.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/N2O_1765_2005.txt, N2O.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CFC11_1765_2005.txt, CFC11.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CFC12_1765_2005.txt, CFC12.txt),\
+# Note: the SOLARANDVOLCANOES.txt is only used for LMDZ_Physics=AP and NPv3.2 (if ok_suntime_rrtm=n)
+ListNonDel= (${R_IN}/ATM/GHG/CMIP6/historical/CO2_CMIP6_0000_2014.txt, CO2.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CH4_CMIP6_0000_2014.txt, CH4.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/N2O_CMIP6_0000_2014.txt, N2O.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CFC11eq_CMIP6_0000_2014.txt, CFC11.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CFC12eq_CMIP6_0000_2014.txt, CFC12.txt),\
+            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
             (${R_IN}/ATM/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_1855_v5.nc, aerosols.nat.nc)
 

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

@@ -65 +65 @@
         (${R_IN}/ATM/STRATAERO/CMIP6/v1/${RESOL_ATM_XY}/L${RESOL_ATM_Z}/tauswstrat.2D.${year}.nc, tauswstrat.2D.nc)
 
-ListNonDel= (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CO2_1765_2005.txt, CO2.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CH4_1765_2005.txt, CH4.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/N2O_1765_2005.txt, N2O.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CFC11_1765_2005.txt, CFC11.txt),\
-            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/CFC12_1765_2005.txt, CFC12.txt),\
+# Note: the SOLARANDVOLCANOES.txt is only used for LMDZ_Physics=AP and NPv3.2 (if ok_suntime_rrtm=n)
+ListNonDel= (${R_IN}/ATM/GHG/CMIP6/historical/CO2_CMIP6_0000_2014.txt, CO2.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CH4_CMIP6_0000_2014.txt, CH4.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/N2O_CMIP6_0000_2014.txt, N2O.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CFC11eq_CMIP6_0000_2014.txt, CFC11.txt),\
+            (${R_IN}/ATM/GHG/CMIP6/historical/CFC12eq_CMIP6_0000_2014.txt, CFC12.txt),\
+            (${R_IN}/ATM/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
             (${R_IN}/ATM/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_1855_v5.nc, aerosols.nat.nc)
 

CONFIG/UNIFORM/v6/propagate_master_config.ksh

@@ -24 +24 @@
 ConfigList=`ls |grep ${ConfigFamily} |grep -v out`
 ConfigList=$ConfigList" IPSLCM6" 
+ConfigList="IPSLCM6 LMDZOR_v6" 
 echo  All modifications in configuration $MasterConfig will copied to the other configurations $ConfigList .