Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update presaero and CO2 datasets for datm7 to new CMIP6 version #2828

Merged
merged 2 commits into from
Oct 8, 2018
Merged

Update presaero and CO2 datasets for datm7 to new CMIP6 version #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
732d6e1
Update with new CMIP6 presaero historical for 1850, 20tr and 2000, an…
ekluzek Oct 3, 2018
dd4b514
Fix match order, fix end year
ekluzek Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/components/data_comps/datm/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@

<entry id="DATM_PRESAERO">
<type>char</type>
<valid_values>none,clim_1850,clim_2000,trans_1850-2000,rcp2.6,rcp4.5,rcp6.0,rcp8.5,cplhist</valid_values>
<valid_values>none,clim_1850,clim_2000,clim_2010,trans_1850-2000,rcp2.6,rcp4.5,rcp6.0,rcp8.5,cplhist</valid_values>
<default_value>clim_2000</default_value>
<values match="last">
<value compset="^1850_">clim_1850</value>
<value compset="^2000_">clim_2000</value>
<value compset="^2010_">clim_2010</value>
<value compset="^RCP8_">rcp8.5</value>
<value compset="^RCP6_">rcp6.0</value>
<value compset="^RCP4_">rcp4.5</value>
Expand Down Expand Up @@ -91,7 +93,7 @@

<entry id="DATM_CO2_TSERIES">
<type>char</type>
<valid_values>none,20tr,rcp2.6,rcp4.5,rcp6.0,rcp8.5</valid_values>
<valid_values>none,20tr,20tr.latbnd,rcp2.6,rcp4.5,rcp6.0,rcp8.5</valid_values>
<default_value>none</default_value>
<values match="last">
<value compset="^RCP8">rcp8.5</value>
Expand Down Expand Up @@ -203,8 +205,10 @@
<value compset="1850.*_DATM%CRU">1</value>
<value compset="2000.*_DATM%CRU">1</value>
<value compset="2003.*_DATM%CRU">1</value>
<value compset="2010.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="2000.*_DATM%GSW">1</value>
<value compset="2010.*_DATM%GSW">1</value>
<value compset="2003.*_DATM%GSW">1</value>
</values>
<group>run_component_datm</group>
Expand Down Expand Up @@ -237,8 +241,10 @@
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="2000.*_DATM%CRU">1991</value>
<value compset="2003.*_DATM%CRU">2002</value>
<value compset="2010.*_DATM%CRU">2005</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="2000.*_DATM%GSW">1991</value>
<value compset="2010.*_DATM%GSW">2005</value>
<value compset="2003.*_DATM%GSW">2002</value>
</values>
<group>run_component_datm</group>
Expand Down Expand Up @@ -271,8 +277,10 @@
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="2000.*_DATM%CRU">2010</value>
<value compset="2003.*_DATM%CRU">2003</value>
<value compset="2010.*_DATM%CRU">2015</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="2000.*_DATM%GSW">2010</value>
<value compset="2010.*_DATM%GSW">2015</value>
<value compset="2003.*_DATM%GSW">2003</value>
</values>
<group>run_component_datm</group>
Expand Down
43 changes: 28 additions & 15 deletions src/components/data_comps/datm/cime_config/namelist_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
CLMGSWP3v1.TPQW

co2tseries.20tr
co2tseries.20tr.latbnd
co2tseries.rcp2.6
co2tseries.rcp4.5
co2tseries.rcp6.0
Expand Down Expand Up @@ -127,6 +128,7 @@

presaero.clim_1850
presaero.clim_2000
presaero.clim_2010
presaero.trans_1850-2000
presaero.rcp2.6
presaero.rcp4.5
Expand Down Expand Up @@ -233,6 +235,7 @@
<value stream="presaero.cplhist">null</value>
<value stream="presaero.clim_1850">$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero </value>
<value stream="presaero.clim_2000">$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero </value>
<value stream="presaero.clim_2010">$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero </value>
<value stream="presaero.trans_1850-2000">$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero</value>
<value stream="presaero.rcp">$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero</value>
<value stream="topo.observed">$DIN_LOC_ROOT/atm/datm7/topo_forcing</value>
Expand All @@ -245,7 +248,7 @@
<category>streams</category>
<group>streams_file</group>
<desc>Stream domain file path(s).</desc>
<values>
<values match="first">
<value>null</value>
<value stream="CLM1PT.1x1_mexicocityMEX">domain.lnd.1x1pt-mexicocityMEX_navy.090715.nc</value>
<value stream="CLM1PT.1x1_vancouverCAN">domain.lnd.1x1pt-vancouverCAN_navy.090715.nc </value>
Expand Down Expand Up @@ -291,7 +294,8 @@
<value stream="CORE_IAF_JRA.NCEP.U_10">domain.atm.TL319.151007.nc</value>
<value stream="CORE_IAF_JRA.NCEP.V_10">domain.atm.TL319.151007.nc</value>
<value stream="CORE_IAF_JRA.CORE2.ArcFactor">CORE2.t_10.ArcFactor.T62.1997-2004.nc</value>
<value stream="co2tseries.20tr">fco2_datm_1765-2007_c100614.nc</value>
<value stream="co2tseries.20tr.latbnd">fco2_datm_lat-bands_simyr_1750-2015_CMIP6_c180929.nc</value>
<value stream="co2tseries.20tr">fco2_datm_global_simyr_1750-2014_CMIP6_c180929.nc</value>
<value stream="co2tseries.rcp2.6">fco2_datm_rcp2.6_1765-2500_c130312.nc</value>
<value stream="co2tseries.rcp4.5">fco2_datm_rcp4.5_1765-2500_c130312.nc</value>
<value stream="co2tseries.rcp6.0">fco2_datm_rcp6.0_1765-2500_c130312.nc</value>
Expand All @@ -306,9 +310,10 @@
<value stream="presaero.rcp4.5" atm_grid="CLM_USRDAT">aerosoldep_rcp4.5_monthly_1849-2104_${CLM_USRDAT_NAME}.nc</value>
<value stream="presaero.rcp6.0" atm_grid="CLM_USRDAT">aerosoldep_rcp6_monthly_1849-2104_${CLM_USRDAT_NAME}.nc</value>

<value stream="presaero.clim_1850">aerosoldep_monthly_1850_mean_1.9x2.5_c090421.nc</value>
<value stream="presaero.clim_2000">aerosoldep_monthly_2000_mean_1.9x2.5_c090421.nc</value>
<value stream="presaero.trans_1850-2000">aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc</value>
<value stream="presaero.clim_1850">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.clim_2000">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.clim_2010">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.trans_1850-2000">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.rcp2.6">aerosoldep_rcp2.6_monthly_1849-2104_1.9x2.5_c100402.nc</value>
<value stream="presaero.rcp4.5">aerosoldep_rcp4.5_monthly_1849-2104_1.9x2.5_c100402.nc</value>
<value stream="presaero.rcp6.0">aerosoldep_rcp6.0_monthly_1849-2104_1.9x2.5_c100830.nc</value>
Expand Down Expand Up @@ -431,7 +436,7 @@
<category>streams</category>
<group>streams_file</group>
<desc>Stream data file path(s).</desc>
<values>
<values match="first">
<value>null</value>
<value stream="CLM1PT.1x1_mexicocityMEX">clm1pt-1993-12.nc</value>
<value stream="CLM1PT.1x1_vancouverCAN">clm1pt-1992-08.nc</value>
Expand Down Expand Up @@ -1620,7 +1625,8 @@
JRA.v1.3.v_10.TL319.2016.171019.nc
</value>
<value stream="CORE_IAF_JRA.CORE2.ArcFactor">CORE2.t_10.ArcFactor.T62.1997-2004.nc</value>
<value stream="co2tseries.20tr">fco2_datm_1765-2007_c100614.nc</value>
<value stream="co2tseries.20tr.latbnd">fco2_datm_lat-bands_simyr_1750-2015_CMIP6_c180929.nc</value>
<value stream="co2tseries.20tr">fco2_datm_global_simyr_1750-2014_CMIP6_c180929.nc</value>
<value stream="co2tseries.rcp2.6">fco2_datm_rcp2.6_1765-2500_c130312.nc</value>
<value stream="co2tseries.rcp4.5">fco2_datm_rcp4.5_1765-2500_c130312.nc</value>
<value stream="co2tseries.rcp6.0">fco2_datm_rcp6.0_1765-2500_c130312.nc</value>
Expand All @@ -1637,9 +1643,10 @@
<value stream="Anomaly.Forcing.Shortwave">af.rsds.ccsm4.rcp45.2006-2300.nc</value>
<value stream="Anomaly.Forcing.Longwave">af.rlds.ccsm4.rcp45.2006-2300.nc</value>

<value stream="presaero.clim_1850">aerosoldep_monthly_1850_mean_1.9x2.5_c090421.nc</value>
<value stream="presaero.clim_2000">aerosoldep_monthly_2000_mean_1.9x2.5_c090421.nc</value>
<value stream="presaero.trans_1850-2000">aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc</value>
<value stream="presaero.clim_1850">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.clim_2000">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.clim_2010">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.trans_1850-2000">aerosoldep_WACCM.ensmean_monthly_hist_1849-2015_0.9x1.25_CMIP6_c180926.nc</value>
<value stream="presaero.rcp2.6">aerosoldep_rcp2.6_monthly_1849-2104_1.9x2.5_c100402.nc</value>
<value stream="presaero.rcp2.6" atm_grid="CLM_USRDAT">aerosoldep_rcp2.6_monthly_1849-2104_${CLM_USRDAT_NAME}.nc</value>
<value stream="presaero.rcp4.5">aerosoldep_rcp4.5_monthly_1849-2104_1.9x2.5_c100402.nc</value>
Expand Down Expand Up @@ -2011,7 +2018,9 @@
<value stream="BC.CRUNCEP.CMAP.Precip">1979</value>
<value stream="Anomaly.Forcing">2006</value>
<value stream="presaero.cplhist">$DATM_CPLHIST_YR_ALIGN</value>
<value stream="presaero.clim">1</value>
<value stream="presaero.clim_1850">1</value>
<value stream="presaero.clim_2000">1</value>
<value stream="presaero.clim_2010">1</value>
<value stream="presaero.trans_1850-2000">1849</value>
<value stream="presaero.rcp">1849</value>
<value stream="topo.observed">1</value>
Expand Down Expand Up @@ -2072,7 +2081,9 @@
<value stream="BC.CRUNCEP">1979</value>
<value stream="Anomaly.Forcing">2006</value>
<value stream="presaero.cplhist">$DATM_CPLHIST_YR_START</value>
<value stream="presaero.clim">1</value>
<value stream="presaero.clim_1850">1850</value>
<value stream="presaero.clim_2000">2000</value>
<value stream="presaero.clim_2010">2010</value>
<value stream="presaero.trans_1850-2000">1849</value>
<value stream="presaero.rcp">1849</value>
<value stream="topo.observed">1</value>
Expand Down Expand Up @@ -2127,15 +2138,17 @@
<value stream="CORE_IAF_JRA.NCEP.U_10">2016</value>
<value stream="CORE_IAF_JRA.NCEP.V_10">2016</value>
<value stream="CORE_IAF_JRA.CORE2.ArcFactor">2016</value>
<value stream="co2tseries.20tr">2007</value>
<value stream="co2tseries.20tr">2014</value>
<value stream="co2tseries.rcp">2500</value>
<value stream="BC.QIAN.Precip">2004</value>
<value stream="BC.CRUNCEP.GPCP.Precip">2012</value>
<value stream="BC.CRUNCEP.CMAP.Precip">2010</value>
<value stream="Anomaly.Forcing">2300</value>
<value stream="presaero.cplhist">$DATM_CPLHIST_YR_END</value>
<value stream="presaero.clim">1</value>
<value stream="presaero.trans_1850-2000">2006</value>
<value stream="presaero.clim_1850">1850</value>
<value stream="presaero.clim_2000">2000</value>
<value stream="presaero.clim_2010">2010</value>
<value stream="presaero.trans_1850-2000">2014</value>
<value stream="presaero.rcp">2104</value>
<value stream="topo.observed">1</value>
<value stream="topo.cplhist">$DATM_CPLHIST_YR_END</value>
Expand Down