diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index 35bf01b6..0adc94f6 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -165,7 +165,7 @@ char - none,20tr,20tr.latbnd,omip.iaf,omip.jra,SSP1-1.9,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP4-3.4,SSP4-6.0,SSP5-3.4,SSP5-8.5,SSP1-1.9.latbnd,SSP1-2.6.latbnd,SSP2-4.5.latbnd,SSP3-7.0.latbnd,SSP4-3.4.latbnd,SSP4-6.0.latbnd,SSP5-3.4.latbnd,SSP5-8.5.latbnd + none,cmip6_20tr,cmip7_20tr,omip.iaf,omip.jra,SSP1-1.9,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP4-3.4,SSP4-6.0,SSP5-3.4,SSP5-8.5 none SSP1-1.9 @@ -176,8 +176,8 @@ SSP4-6.0 SSP5-3.4 SSP5-8.5 - 20tr - 20tr + cmip6_20tr + cmip6_20tr omip.iaf omip.jra diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 5ec085c1..0e52cc38 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -145,8 +145,8 @@ optional stream co2tseries (turned on and stream specified by xml variable DATM_CO2_TSERIES) - DATM_CO2_TSERIES is set by the 4 character time prefix in config_component.xml ======================== - co2tseries.20tr - co2tseries.20tr.latbnd + co2tseries.cmip6_20tr + co2tseries.cmip7_20tr co2tseries.omip.iaf co2tseries.omip.jra co2tseries.SSP1-1.9 @@ -157,14 +157,6 @@ co2tseries.SSP4-6.0 co2tseries.SSP5-3.4 co2tseries.SSP5-8.5 - co2tseries.SSP1-1.9.latbnd - co2tseries.SSP1-2.6.latbnd - co2tseries.SSP2-4.5.latbnd - co2tseries.SSP3-7.0.latbnd - co2tseries.SSP4-3.4.latbnd - co2tseries.SSP4-6.0.latbnd - co2tseries.SSP5-3.4.latbnd - co2tseries.SSP5-8.5.latbnd ======================== optional stream presaero (turned on and stream specified by xml variable DATM_PRESAERO) @@ -3646,7 +3638,7 @@ - + none @@ -3677,24 +3669,24 @@ single - + none - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc + $DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022_CMIP7_c20250228.nc - CO2 Sa_co2diag + co2 Sa_co2diag null none null - 213 - 1850 - 2010 + 1750 + 1750 + 2022 0 linear @@ -3708,7 +3700,7 @@ single - + none @@ -3723,226 +3715,9 @@ none null - 198 + 213 1850 - 2019 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-1.9_simyr_2014-2500_CMIP6_c190514.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-2.6__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP2-4.5__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/co2_datm_lat-bandsSSP3-7.0__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-3.4_simyr_2014-2500_CMIP6_c190514.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-6.0__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-3.4__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 + 2010 0 linear @@ -3956,24 +3731,24 @@ single - + none - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-8.5__simyr_2014-2500_CMIP6_c190506.nc + $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc - CO2 Sa_co2diag + CO2 Sa_co2diag null none null - 2015 - 2015 - 2500 + 198 + 1850 + 2019 0 linear