Skip to content

b4b: Introduce separate cmip6 and cmip7 co2 stream files keeping cmip6 as default #375

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

Merged
billsacks merged 16 commits into from
Feb 11, 2026
Merged

b4b: Introduce separate cmip6 and cmip7 co2 stream files keeping cmip6 as default #375

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a06fe0
Update from cmip6 to cmip7 co2 stream file
slevis-lmwg Jan 7, 2026
d226954
Add CMIP7 and creation date to the new co2 file
slevis-lmwg Jan 14, 2026
b59b12b
Remove streams co2tseries.*.latbnd because they do not work correctly
slevis-lmwg Jan 14, 2026
702c997
Keep 2 co2 streams, one for cmip6 and one for cmip7
slevis-lmwg Jan 14, 2026
93feada
Changes to ensure unchanged answers (not tested, yet)
slevis-lmwg Jan 14, 2026
34d1790
Putting back stream_year_align, stream_year_first to 1850 for b4b
slevis-lmwg Jan 15, 2026
592d3de
Merge branch 'main' into cmip7co2file
jedwards4b Jan 20, 2026
e743c42
Change grid from f19_g17_rx1 to TL319_t232 in test
slevis-lmwg Feb 10, 2026
7b02d10
Merge tag 'cdeps1.0.91' into cmip7co2file
slevis-lmwg Feb 10, 2026
ad00e0b
Correct recent grid change to TL319_t232_wt232 in test
slevis-lmwg Feb 10, 2026
fd963ed
Add comment as suggested in review
slevis-lmwg Feb 10, 2026
159a9fd
Add comment as suggested in review
slevis-lmwg Feb 10, 2026
5bb5d24
Add comment as suggested in review
slevis-lmwg Feb 10, 2026
66c36ba
Add comment as suggested in review
slevis-lmwg Feb 10, 2026
7c3078d
Fix typo
slevis-lmwg Feb 10, 2026
6323e28
Remove redundant comment
slevis-lmwg Feb 11, 2026
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
6 changes: 3 additions & 3 deletions datm/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

<entry id="DATM_CO2_TSERIES">
<type>char</type>
<valid_values>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</valid_values>
<valid_values>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</valid_values>
<default_value>none</default_value>
<values match="last">
<value compset="^SSP119_">SSP1-1.9</value>
Expand All @@ -174,8 +174,8 @@
<value compset="^SSP460_">SSP4-6.0</value>
<value compset="^SSP534_">SSP5-3.4</value>
<value compset="^SSP585_">SSP5-8.5</value>
<value compset="^HIST[CE]?_" >20tr</value>
<value compset="^20TR" >20tr</value>
<value compset="^HIST[CE]?_">cmip6_20tr</value>
<value compset="^20TR" >cmip6_20tr</value>
<value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
<value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">omip.jra</value>
</values>
Expand Down
261 changes: 18 additions & 243 deletions datm/cime_config/stream_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,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
Comment thread
slevis-lmwg marked this conversation as resolved.
========================
co2tseries.20tr
co2tseries.20tr.latbnd
co2tseries.cmip6_20tr
Comment thread
ekluzek marked this conversation as resolved.
co2tseries.cmip7_20tr
co2tseries.omip.iaf
co2tseries.omip.jra
co2tseries.SSP1-1.9
Comment thread
slevis-lmwg marked this conversation as resolved.
Expand All @@ -165,14 +165,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)
Expand Down Expand Up @@ -3755,7 +3747,7 @@

<!-- currently all co2 time series are single point and have no mesh -->

<stream_entry name="co2tseries.20tr">
<stream_entry name="co2tseries.cmip6_20tr">
Comment thread
slevis-lmwg marked this conversation as resolved.
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
Expand Down Expand Up @@ -3786,24 +3778,24 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.omip.iaf">
<stream_entry name="co2tseries.cmip7_20tr">
Comment thread
ekluzek marked this conversation as resolved.
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc</file>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022_CMIP7_c20250228.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
<var>co2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>213</stream_year_align> <!-- 6*(2009-1948+1)-(2009-1850) -->
<stream_year_first>1850</stream_year_first>
<stream_year_last>2010</stream_year_last>
<stream_year_align>1750</stream_year_align>
Comment thread
slevis-lmwg marked this conversation as resolved.
<stream_year_first>1750</stream_year_first>
Comment thread
slevis-lmwg marked this conversation as resolved.
<stream_year_last>2022</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
Expand All @@ -3817,7 +3809,7 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.omip.jra">
<stream_entry name="co2tseries.omip.iaf">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
Expand All @@ -3832,226 +3824,9 @@
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>198</stream_year_align> <!-- 6*(2018-1958+1)-(2018-1850) -->
<stream_year_align>213</stream_year_align> <!-- 6*(2009-1948+1)-(2009-1850) -->
<stream_year_first>1850</stream_year_first>
<stream_year_last>2019</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP1-1.9.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-1.9_simyr_2014-2500_CMIP6_c190514.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP1-2.6.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-2.6__simyr_2014-2500_CMIP6_c190506.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP2-4.5.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP2-4.5__simyr_2014-2500_CMIP6_c190506.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP3-7.0.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_datm_lat-bandsSSP3-7.0__simyr_2014-2500_CMIP6_c190506.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP4-3.4.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-3.4_simyr_2014-2500_CMIP6_c190514.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP4-6.0.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-6.0__simyr_2014-2500_CMIP6_c190506.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>extend</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.e30</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP5-3.4.latbnd">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-3.4__simyr_2014-2500_CMIP6_c190506.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_year_last>2010</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
Expand All @@ -4065,24 +3840,24 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.SSP5-8.5.latbnd">
<stream_entry name="co2tseries.omip.jra">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-8.5__simyr_2014-2500_CMIP6_c190506.nc</file>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc</file>
</stream_datafiles>
<stream_datavars>
<var>CO2 Sa_co2diag</var>
<var>CO2 Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>2015</stream_year_align>
<stream_year_first>2015</stream_year_first>
<stream_year_last>2500</stream_year_last>
<stream_year_align>198</stream_year_align> <!-- 6*(2018-1958+1)-(2018-1850) -->
<stream_year_first>1850</stream_year_first>
<stream_year_last>2019</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
Expand Down
2 changes: 1 addition & 1 deletion drof/cime_config/testdefs/testlist_drof.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<testlist version="2.0">

<test compset="2000_SATM_SLND_SICE_SOCN_DROF%NYF_SGLC_SWAV" grid="f19_g17_rx1" name="SMS_Ld3">
<test compset="2000_SATM_SLND_SICE_SOCN_DROF%NYF_SGLC_SWAV" grid="TL319_t232_wt232" name="SMS_Ld3">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Expand Down