Changeset 1334 for CONFIG/LMDZOR/branches

Timestamp:

03/11/11 10:07:19 (13 years ago)

Author:

jgipsl

Message:

Modified lmdz.driver to read file for GHG forcing not containing year so the same driver could be used for different historical or rcp runs

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP

Files:

• lmdz.card_AMIP (modified) (1 diff)
• lmdz.driver (modified) (1 diff)

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/lmdz.card_AMIP

@@ -51 +51 @@
 # With AR5 aerosols (including ASSO4M(=SO4), CSSO4M, AIBCM, ASBCM, AIPOMM, ASPOMM, ASSSM, CSSSM, SSSSM, CIDUSTM)
 # With AR5 ozone(tropo + strato from LMDZOR-INCA-REPROBUS simulations)
-ListNonDel= (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, .),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CO2_1765_2005.txt, .),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CH4_1765_2005.txt, .),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/N2O_1765_2005.txt, .),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CFC11_1765_2005.txt, .),\
-            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CFC12_1765_2005.txt, .),\
+ListNonDel= (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/SOLARANDVOLCANOES_1610_2008.txt, SOLARANDVOLCANOES.txt),\
+            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CO2_1765_2005.txt, CO2.txt),\
+            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CH4_1765_2005.txt, CH4.txt),\
+            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/N2O_1765_2005.txt, N2O.txt),\
+            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CFC11_1765_2005.txt, CFC11.txt),\
+            (${R_BC}/ATM/${config_UserChoices_TagName}/IPCC_AR5/HISTORIQUE/CFC12_1765_2005.txt, CFC12.txt),\
             (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/AR5/HISTORIQUE/aerosols_11YearsClim_1855_v3.nc, aerosols.nat.nc)
 

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/lmdz.driver

@@ -179 +179 @@
 
     ##-- GHG forcing for the current year if forcing file is availible
-    if [ -f SOLARANDVOLCANOES_1610_2008.txt ] ; then
-        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES_1610_2008.txt | awk -F= '{print $2}'`
+    if [ -f SOLARANDVOLCANOES.txt ] ; then
+        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR}
     fi
-    if [ -f CO2_1765_2005.txt ] ; then
-        IPCC_CO2=`grep Annee_${year} CO2_1765_2005.txt | awk -F= '{print $2}'`
+    if [ -f CO2.txt ] ; then
+        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2}
     fi
-    if [ -f CH4_1765_2005.txt ] ; then
-        IPCC_CH4=`grep Annee_${year} CH4_1765_2005.txt | awk -F= '{print $2}'`
+    if [ -f CH4.txt ] ; then
+        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4}
     fi
-    if [ -f N2O_1765_2005.txt ] ; then
-        IPCC_N2O=`grep Annee_${year} N2O_1765_2005.txt | awk -F= '{print $2}'`
+    if [ -f N2O.txt ] ; then
+        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O}
     fi
-    if [ -f CFC11_1765_2005.txt ] ; then
-        IPCC_CFC11=`grep Annee_${year} CFC11_1765_2005.txt | awk -F= '{print $2}'`
+    if [ -f CFC11.txt ] ; then
+        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11}
     fi
-    if [ -f CFC12_1765_2005.txt ] ; then
-        IPCC_CFC12=`grep Annee_${year} CFC12_1765_2005.txt | awk -F= '{print $2}'`
+    if [ -f CFC12.txt ] ; then
+        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'`
         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12}
     fi