From 5a06fe06abe1dd65d8866307ae71926db90d8996 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 7 Jan 2026 15:25:24 -0700 Subject: [PATCH 01/14] Update from cmip6 to cmip7 co2 stream file --- datm/cime_config/stream_definition_datm.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 8ce6fad3d..ec8b41115 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -3516,19 +3516,19 @@ none - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_simyr_1750-2014_CMIP6_c180929.nc + $DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022.nc - CO2 Sa_co2diag + co2 Sa_co2diag null none null - 1850 - 1850 - 2014 + 1750 + 1750 + 2022 0 linear From d226954833be8bb7ef7a4c182d2969bb54d285b1 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 13 Jan 2026 18:08:14 -0700 Subject: [PATCH 02/14] Add CMIP7 and creation date to the new co2 file --- datm/cime_config/stream_definition_datm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index ec8b41115..fcd4b4adb 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -3516,7 +3516,7 @@ none - $DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022.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 From b59b12bcb5a117454b62340e685e8e58226aa79c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 13 Jan 2026 18:22:29 -0700 Subject: [PATCH 03/14] Remove streams co2tseries.*.latbnd because they do not work correctly --- datm/cime_config/stream_definition_datm.xml | 257 -------------------- 1 file changed, 257 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index fcd4b4adb..42e1623b0 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -147,7 +147,6 @@ - DATM_CO2_TSERIES is set by the 4 character time prefix in config_component.xml ======================== co2tseries.20tr - co2tseries.20tr.latbnd co2tseries.omip.iaf co2tseries.omip.jra co2tseries.SSP1-1.9 @@ -158,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) @@ -3604,254 +3595,6 @@ 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 - 0 - - linear - - - extend - - - 1.e30 - - single - - - - - none - - - $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-8.5__simyr_2014-2500_CMIP6_c190506.nc - - - CO2 Sa_co2diag - - null - - none - - null - 2015 - 2015 - 2500 - 0 - - linear - - - extend - - - 1.e30 - - single - - none From 702c9970920cd1971828c74ec40870ef10029be7 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 14 Jan 2026 10:51:03 -0700 Subject: [PATCH 04/14] Keep 2 co2 streams, one for cmip6 and one for cmip7 --- datm/cime_config/stream_definition_datm.xml | 36 +++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 42e1623b0..adb4d38be 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -146,7 +146,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.cmip6_20tr + co2tseries.cmip7_20tr co2tseries.omip.iaf co2tseries.omip.jra co2tseries.SSP1-1.9 @@ -3502,7 +3503,38 @@ - + + + none + + + $DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_simyr_1750-2014_CMIP6_c180929.nc + + + CO2 Sa_co2diag + + null + + none + + null + 1750 + 1750 + 2014 + 0 + + linear + + + extend + + + 1.e30 + + single + + + none From 93feadab4ffe199318fddb8670fce2187ee618c3 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 14 Jan 2026 12:49:18 -0700 Subject: [PATCH 05/14] Changes to ensure unchanged answers (not tested, yet) --- datm/cime_config/config_component.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datm/cime_config/config_component.xml b/datm/cime_config/config_component.xml index 57762b9e2..5bf22d387 100644 --- a/datm/cime_config/config_component.xml +++ b/datm/cime_config/config_component.xml @@ -156,7 +156,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 @@ -167,8 +167,8 @@ SSP4-6.0 SSP5-3.4 SSP5-8.5 - 20tr - 20tr + cmip6_20tr + cmip6_20tr omip.iaf omip.jra From 34d1790d3c9b8dff28b197f1a70cb8b12e2f0eb1 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 15 Jan 2026 11:46:31 -0700 Subject: [PATCH 06/14] Putting back stream_year_align, stream_year_first to 1850 for b4b Many aux_clm BASELINE tests showed DIFFs when I changed these variables to 1750. I had expected no effect, but it's beyond the scope of this PR to investigate. --- datm/cime_config/stream_definition_datm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index adb4d38be..f0e20f92d 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -3518,8 +3518,8 @@ none null - 1750 - 1750 + 1850 + 1850 2014 0 From e743c42c410e54e178e64cdab52cc868dc528b43 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 13:21:17 -0700 Subject: [PATCH 07/14] Change grid from f19_g17_rx1 to TL319_t232 in test --- drof/cime_config/testdefs/testlist_drof.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drof/cime_config/testdefs/testlist_drof.xml b/drof/cime_config/testdefs/testlist_drof.xml index 6e423fabe..9976736e6 100644 --- a/drof/cime_config/testdefs/testlist_drof.xml +++ b/drof/cime_config/testdefs/testlist_drof.xml @@ -1,7 +1,7 @@ - + From ad00e0bc9d997861edce16969e4b120bf5865b09 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 14:55:02 -0700 Subject: [PATCH 08/14] Correct recent grid change to TL319_t232_wt232 in test --- drof/cime_config/testdefs/testlist_drof.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drof/cime_config/testdefs/testlist_drof.xml b/drof/cime_config/testdefs/testlist_drof.xml index 259ff6f45..f97468eb1 100644 --- a/drof/cime_config/testdefs/testlist_drof.xml +++ b/drof/cime_config/testdefs/testlist_drof.xml @@ -1,7 +1,7 @@ - + From fd963ed0cf59ddf4beee931554dae7a4e3619e08 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 15:39:29 -0800 Subject: [PATCH 09/14] Add comment as suggested in review Co-authored-by: Erik Kluzek --- datm/cime_config/stream_definition_datm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 1c3ce395d..b99c6a1ce 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -3747,6 +3747,7 @@ + none From 159a9fd31f3bbcf33cd6c1638111bda31ef5b559 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 15:40:20 -0800 Subject: [PATCH 10/14] Add comment as suggested in review Co-authored-by: Erik Kluzek --- datm/cime_config/stream_definition_datm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index b99c6a1ce..04c3cd55f 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -3872,6 +3872,7 @@ single + none From 5bb5d240fe7d57b5a26f412dcfe80e76c6bbcbf4 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 15:41:38 -0800 Subject: [PATCH 11/14] Add comment as suggested in review Co-authored-by: Erik Kluzek --- datm/cime_config/stream_definition_datm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 04c3cd55f..6448e4dfa 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -157,6 +157,7 @@ co2tseries.cmip7_20tr co2tseries.omip.iaf co2tseries.omip.jra + # CO2 time-series for SSP future scenarios are all CMIP6 era co2tseries.SSP1-1.9 co2tseries.SSP1-2.6 co2tseries.SSP2-4.5 From 66c36ba3b00ae0cad9930dc1934b21f993f7c48c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 15:45:13 -0800 Subject: [PATCH 12/14] Add comment as suggested in review Co-authored-by: Erik Kluzek --- datm/cime_config/stream_definition_datm.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 6448e4dfa..5c7b3b31e 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -152,6 +152,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 + - The historical series are labeled as either CMIP6 or CMIP6 era + - The SSP future scenarios are all CMIP6 era data ======================== co2tseries.cmip6_20tr co2tseries.cmip7_20tr From 7c3078d51dfcff0f88226fbea464b2d787708c99 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 10 Feb 2026 15:46:32 -0800 Subject: [PATCH 13/14] Fix typo --- datm/cime_config/stream_definition_datm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 5c7b3b31e..85b5ce834 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -152,7 +152,7 @@ ======================== 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 - - The historical series are labeled as either CMIP6 or CMIP6 era + - The historical series are labeled as either CMIP6 or CMIP7 era - The SSP future scenarios are all CMIP6 era data ======================== co2tseries.cmip6_20tr From 6323e288702822a0ef01ee926f5609cb30609c06 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 11 Feb 2026 11:24:22 -0700 Subject: [PATCH 14/14] Remove redundant comment --- datm/cime_config/stream_definition_datm.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml index 85b5ce834..c7460c200 100644 --- a/datm/cime_config/stream_definition_datm.xml +++ b/datm/cime_config/stream_definition_datm.xml @@ -159,7 +159,6 @@ co2tseries.cmip7_20tr co2tseries.omip.iaf co2tseries.omip.jra - # CO2 time-series for SSP future scenarios are all CMIP6 era co2tseries.SSP1-1.9 co2tseries.SSP1-2.6 co2tseries.SSP2-4.5