Skip to content

Commit 099fdb8

Browse files
billsacksbillsacks
authored
Merge pull request #375 from slevis-lmwg/cmip7co2file
b4b: Introduce separate cmip6 and cmip7 co2 stream files keeping cmip6 as default CDEPS issues: Resolves #352 Resolves #361 Resolves #379 Are there dependencies on other component PRs (if so list): CTSM issue ESCOMP/CTSM#3386 CTSM PR to update .gitmodules with this PR's changes: TODO Are changes expected to change answers (bfb, different to roundoff, more substantial): No. Erik Kluzek proposed that we make this PR b4b by keeping cmip6 as the default. (Later, we will make the cmip7 co2 dataset the default, at which point we expect greater than roundoff diffs.) Any User Interface Changes (namelist or namelist defaults changes): The new dataset spans 1750-2022 instead of 1750-2014. Also, co2tseries.20tr got split into the two options co2tseries.cmip6_20tr and co2tseries.cmip7_20tr. Testing performed (e.g. aux_cdeps, CESM prealpha, etc): At the time of opening this PR I had completed 1-day simulations in ``` /glade/derecho/scratch/slevis/archive/IHistClm6BgcCropCrujra_f09_ctsm5.4.003/cmip7co2 /glade/derecho/scratch/slevis/archive/IHistClm6BgcCropCrujra_f09_ctsm5.4.005 ``` and the PCO2 output looked - identical in these two cmip7 cases and - similar to the following cmip6 1-day baseline: `/glade/derecho/scratch/slevis/archive/IHistClm6BgcCropCrujra_f09_ctsm5.4.003/cmip6co2` Hashes used for testing: 1-day baseline: ctsm5.4.003 1-day experiment: ctsm5.4.003 with co2 stream changes in user_nl_datm_streams 1-day experiment: ctsm5.4.005 with cdeps1.0.84-1-g5a06fe0 (this PR)
2 parents 408e6a4 + 6323e28 commit 099fdb8

File tree

3 files changed

+26
-247
lines changed

3 files changed

+26
-247
lines changed

‎datm/cime_config/config_component.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<entry id="DATM_CO2_TSERIES">
165165
<type>char</type>
166-
<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>
166+
<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>
167167
<default_value>none</default_value>
168168
<values match="last">
169169
<value compset="^SSP119_">SSP1-1.9</value>
@@ -174,8 +174,8 @@
174174
<value compset="^SSP460_">SSP4-6.0</value>
175175
<value compset="^SSP534_">SSP5-3.4</value>
176176
<value compset="^SSP585_">SSP5-8.5</value>
177-
<value compset="^HIST[CE]?_" >20tr</value>
178-
<value compset="^20TR" >20tr</value>
177+
<value compset="^HIST[CE]?_">cmip6_20tr</value>
178+
<value compset="^20TR" >cmip6_20tr</value>
179179
<value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
180180
<value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">omip.jra</value>
181181
</values>

‎datm/cime_config/stream_definition_datm.xml‎

Lines changed: 22 additions & 243 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,11 @@
152152
========================
153153
optional stream co2tseries (turned on and stream specified by xml variable DATM_CO2_TSERIES)
154154
- DATM_CO2_TSERIES is set by the 4 character time prefix in config_component.xml
155+
- The historical series are labeled as either CMIP6 or CMIP7 era
156+
- The SSP future scenarios are all CMIP6 era data
155157
========================
156-
co2tseries.20tr
157-
co2tseries.20tr.latbnd
158+
co2tseries.cmip6_20tr
159+
co2tseries.cmip7_20tr
158160
co2tseries.omip.iaf
159161
co2tseries.omip.jra
160162
co2tseries.SSP1-1.9
@@ -165,14 +167,6 @@
165167
co2tseries.SSP4-6.0
166168
co2tseries.SSP5-3.4
167169
co2tseries.SSP5-8.5
168-
co2tseries.SSP1-1.9.latbnd
169-
co2tseries.SSP1-2.6.latbnd
170-
co2tseries.SSP2-4.5.latbnd
171-
co2tseries.SSP3-7.0.latbnd
172-
co2tseries.SSP4-3.4.latbnd
173-
co2tseries.SSP4-6.0.latbnd
174-
co2tseries.SSP5-3.4.latbnd
175-
co2tseries.SSP5-8.5.latbnd
176170
177171
========================
178172
optional stream presaero (turned on and stream specified by xml variable DATM_PRESAERO)
@@ -3755,7 +3749,8 @@
37553749

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

3758-
<stream_entry name="co2tseries.20tr">
3752+
<!-- CMIP6 era for 20th Century historical -->
3753+
<stream_entry name="co2tseries.cmip6_20tr">
37593754
<stream_meshfile>
37603755
<meshfile>none</meshfile>
37613756
</stream_meshfile>
@@ -3786,24 +3781,24 @@
37863781
<stream_readmode>single</stream_readmode>
37873782
</stream_entry>
37883783

3789-
<stream_entry name="co2tseries.omip.iaf">
3784+
<stream_entry name="co2tseries.cmip7_20tr">
37903785
<stream_meshfile>
37913786
<meshfile>none</meshfile>
37923787
</stream_meshfile>
37933788
<stream_datafiles>
3794-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc</file>
3789+
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022_CMIP7_c20250228.nc</file>
37953790
</stream_datafiles>
37963791
<stream_datavars>
3797-
<var>CO2 Sa_co2diag</var>
3792+
<var>co2 Sa_co2diag</var>
37983793
</stream_datavars>
37993794
<stream_lev_dimname>null</stream_lev_dimname>
38003795
<stream_mapalgo>
38013796
<mapalgo>none</mapalgo>
38023797
</stream_mapalgo>
38033798
<stream_vectors>null</stream_vectors>
3804-
<stream_year_align>213</stream_year_align> <!-- 6*(2009-1948+1)-(2009-1850) -->
3805-
<stream_year_first>1850</stream_year_first>
3806-
<stream_year_last>2010</stream_year_last>
3799+
<stream_year_align>1750</stream_year_align>
3800+
<stream_year_first>1750</stream_year_first>
3801+
<stream_year_last>2022</stream_year_last>
38073802
<stream_offset>0</stream_offset>
38083803
<stream_tintalgo>
38093804
<tintalgo>linear</tintalgo>
@@ -3817,7 +3812,7 @@
38173812
<stream_readmode>single</stream_readmode>
38183813
</stream_entry>
38193814

3820-
<stream_entry name="co2tseries.omip.jra">
3815+
<stream_entry name="co2tseries.omip.iaf">
38213816
<stream_meshfile>
38223817
<meshfile>none</meshfile>
38233818
</stream_meshfile>
@@ -3832,226 +3827,9 @@
38323827
<mapalgo>none</mapalgo>
38333828
</stream_mapalgo>
38343829
<stream_vectors>null</stream_vectors>
3835-
<stream_year_align>198</stream_year_align> <!-- 6*(2018-1958+1)-(2018-1850) -->
3830+
<stream_year_align>213</stream_year_align> <!-- 6*(2009-1948+1)-(2009-1850) -->
38363831
<stream_year_first>1850</stream_year_first>
3837-
<stream_year_last>2019</stream_year_last>
3838-
<stream_offset>0</stream_offset>
3839-
<stream_tintalgo>
3840-
<tintalgo>linear</tintalgo>
3841-
</stream_tintalgo>
3842-
<stream_taxmode>
3843-
<taxmode>extend</taxmode>
3844-
</stream_taxmode>
3845-
<stream_dtlimit>
3846-
<dtlimit>1.e30</dtlimit>
3847-
</stream_dtlimit>
3848-
<stream_readmode>single</stream_readmode>
3849-
</stream_entry>
3850-
3851-
<stream_entry name="co2tseries.SSP1-1.9.latbnd">
3852-
<stream_meshfile>
3853-
<meshfile>none</meshfile>
3854-
</stream_meshfile>
3855-
<stream_datafiles>
3856-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-1.9_simyr_2014-2500_CMIP6_c190514.nc</file>
3857-
</stream_datafiles>
3858-
<stream_datavars>
3859-
<var>CO2 Sa_co2diag</var>
3860-
</stream_datavars>
3861-
<stream_lev_dimname>null</stream_lev_dimname>
3862-
<stream_mapalgo>
3863-
<mapalgo>none</mapalgo>
3864-
</stream_mapalgo>
3865-
<stream_vectors>null</stream_vectors>
3866-
<stream_year_align>2015</stream_year_align>
3867-
<stream_year_first>2015</stream_year_first>
3868-
<stream_year_last>2500</stream_year_last>
3869-
<stream_offset>0</stream_offset>
3870-
<stream_tintalgo>
3871-
<tintalgo>linear</tintalgo>
3872-
</stream_tintalgo>
3873-
<stream_taxmode>
3874-
<taxmode>extend</taxmode>
3875-
</stream_taxmode>
3876-
<stream_dtlimit>
3877-
<dtlimit>1.e30</dtlimit>
3878-
</stream_dtlimit>
3879-
<stream_readmode>single</stream_readmode>
3880-
</stream_entry>
3881-
3882-
<stream_entry name="co2tseries.SSP1-2.6.latbnd">
3883-
<stream_meshfile>
3884-
<meshfile>none</meshfile>
3885-
</stream_meshfile>
3886-
<stream_datafiles>
3887-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP1-2.6__simyr_2014-2500_CMIP6_c190506.nc</file>
3888-
</stream_datafiles>
3889-
<stream_datavars>
3890-
<var>CO2 Sa_co2diag</var>
3891-
</stream_datavars>
3892-
<stream_lev_dimname>null</stream_lev_dimname>
3893-
<stream_mapalgo>
3894-
<mapalgo>none</mapalgo>
3895-
</stream_mapalgo>
3896-
<stream_vectors>null</stream_vectors>
3897-
<stream_year_align>2015</stream_year_align>
3898-
<stream_year_first>2015</stream_year_first>
3899-
<stream_year_last>2500</stream_year_last>
3900-
<stream_offset>0</stream_offset>
3901-
<stream_tintalgo>
3902-
<tintalgo>linear</tintalgo>
3903-
</stream_tintalgo>
3904-
<stream_taxmode>
3905-
<taxmode>extend</taxmode>
3906-
</stream_taxmode>
3907-
<stream_dtlimit>
3908-
<dtlimit>1.e30</dtlimit>
3909-
</stream_dtlimit>
3910-
<stream_readmode>single</stream_readmode>
3911-
</stream_entry>
3912-
3913-
<stream_entry name="co2tseries.SSP2-4.5.latbnd">
3914-
<stream_meshfile>
3915-
<meshfile>none</meshfile>
3916-
</stream_meshfile>
3917-
<stream_datafiles>
3918-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP2-4.5__simyr_2014-2500_CMIP6_c190506.nc</file>
3919-
</stream_datafiles>
3920-
<stream_datavars>
3921-
<var>CO2 Sa_co2diag</var>
3922-
</stream_datavars>
3923-
<stream_lev_dimname>null</stream_lev_dimname>
3924-
<stream_mapalgo>
3925-
<mapalgo>none</mapalgo>
3926-
</stream_mapalgo>
3927-
<stream_vectors>null</stream_vectors>
3928-
<stream_year_align>2015</stream_year_align>
3929-
<stream_year_first>2015</stream_year_first>
3930-
<stream_year_last>2500</stream_year_last>
3931-
<stream_offset>0</stream_offset>
3932-
<stream_tintalgo>
3933-
<tintalgo>linear</tintalgo>
3934-
</stream_tintalgo>
3935-
<stream_taxmode>
3936-
<taxmode>extend</taxmode>
3937-
</stream_taxmode>
3938-
<stream_dtlimit>
3939-
<dtlimit>1.e30</dtlimit>
3940-
</stream_dtlimit>
3941-
<stream_readmode>single</stream_readmode>
3942-
</stream_entry>
3943-
3944-
<stream_entry name="co2tseries.SSP3-7.0.latbnd">
3945-
<stream_meshfile>
3946-
<meshfile>none</meshfile>
3947-
</stream_meshfile>
3948-
<stream_datafiles>
3949-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_datm_lat-bandsSSP3-7.0__simyr_2014-2500_CMIP6_c190506.nc</file>
3950-
</stream_datafiles>
3951-
<stream_datavars>
3952-
<var>CO2 Sa_co2diag</var>
3953-
</stream_datavars>
3954-
<stream_lev_dimname>null</stream_lev_dimname>
3955-
<stream_mapalgo>
3956-
<mapalgo>none</mapalgo>
3957-
</stream_mapalgo>
3958-
<stream_vectors>null</stream_vectors>
3959-
<stream_year_align>2015</stream_year_align>
3960-
<stream_year_first>2015</stream_year_first>
3961-
<stream_year_last>2500</stream_year_last>
3962-
<stream_offset>0</stream_offset>
3963-
<stream_tintalgo>
3964-
<tintalgo>linear</tintalgo>
3965-
</stream_tintalgo>
3966-
<stream_taxmode>
3967-
<taxmode>extend</taxmode>
3968-
</stream_taxmode>
3969-
<stream_dtlimit>
3970-
<dtlimit>1.e30</dtlimit>
3971-
</stream_dtlimit>
3972-
<stream_readmode>single</stream_readmode>
3973-
</stream_entry>
3974-
3975-
<stream_entry name="co2tseries.SSP4-3.4.latbnd">
3976-
<stream_meshfile>
3977-
<meshfile>none</meshfile>
3978-
</stream_meshfile>
3979-
<stream_datafiles>
3980-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-3.4_simyr_2014-2500_CMIP6_c190514.nc</file>
3981-
</stream_datafiles>
3982-
<stream_datavars>
3983-
<var>CO2 Sa_co2diag</var>
3984-
</stream_datavars>
3985-
<stream_lev_dimname>null</stream_lev_dimname>
3986-
<stream_mapalgo>
3987-
<mapalgo>none</mapalgo>
3988-
</stream_mapalgo>
3989-
<stream_vectors>null</stream_vectors>
3990-
<stream_year_align>2015</stream_year_align>
3991-
<stream_year_first>2015</stream_year_first>
3992-
<stream_year_last>2500</stream_year_last>
3993-
<stream_offset>0</stream_offset>
3994-
<stream_tintalgo>
3995-
<tintalgo>linear</tintalgo>
3996-
</stream_tintalgo>
3997-
<stream_taxmode>
3998-
<taxmode>extend</taxmode>
3999-
</stream_taxmode>
4000-
<stream_dtlimit>
4001-
<dtlimit>1.e30</dtlimit>
4002-
</stream_dtlimit>
4003-
<stream_readmode>single</stream_readmode>
4004-
</stream_entry>
4005-
4006-
<stream_entry name="co2tseries.SSP4-6.0.latbnd">
4007-
<stream_meshfile>
4008-
<meshfile>none</meshfile>
4009-
</stream_meshfile>
4010-
<stream_datafiles>
4011-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP4-6.0__simyr_2014-2500_CMIP6_c190506.nc</file>
4012-
</stream_datafiles>
4013-
<stream_datavars>
4014-
<var>CO2 Sa_co2diag</var>
4015-
</stream_datavars>
4016-
<stream_lev_dimname>null</stream_lev_dimname>
4017-
<stream_mapalgo>
4018-
<mapalgo>none</mapalgo>
4019-
</stream_mapalgo>
4020-
<stream_vectors>null</stream_vectors>
4021-
<stream_year_align>2015</stream_year_align>
4022-
<stream_year_first>2015</stream_year_first>
4023-
<stream_year_last>2500</stream_year_last>
4024-
<stream_offset>0</stream_offset>
4025-
<stream_tintalgo>
4026-
<tintalgo>linear</tintalgo>
4027-
</stream_tintalgo>
4028-
<stream_taxmode>
4029-
<taxmode>extend</taxmode>
4030-
</stream_taxmode>
4031-
<stream_dtlimit>
4032-
<dtlimit>1.e30</dtlimit>
4033-
</stream_dtlimit>
4034-
<stream_readmode>single</stream_readmode>
4035-
</stream_entry>
4036-
4037-
<stream_entry name="co2tseries.SSP5-3.4.latbnd">
4038-
<stream_meshfile>
4039-
<meshfile>none</meshfile>
4040-
</stream_meshfile>
4041-
<stream_datafiles>
4042-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-3.4__simyr_2014-2500_CMIP6_c190506.nc</file>
4043-
</stream_datafiles>
4044-
<stream_datavars>
4045-
<var>CO2 Sa_co2diag</var>
4046-
</stream_datavars>
4047-
<stream_lev_dimname>null</stream_lev_dimname>
4048-
<stream_mapalgo>
4049-
<mapalgo>none</mapalgo>
4050-
</stream_mapalgo>
4051-
<stream_vectors>null</stream_vectors>
4052-
<stream_year_align>2015</stream_year_align>
4053-
<stream_year_first>2015</stream_year_first>
4054-
<stream_year_last>2500</stream_year_last>
3832+
<stream_year_last>2010</stream_year_last>
40553833
<stream_offset>0</stream_offset>
40563834
<stream_tintalgo>
40573835
<tintalgo>linear</tintalgo>
@@ -4065,24 +3843,24 @@
40653843
<stream_readmode>single</stream_readmode>
40663844
</stream_entry>
40673845

4068-
<stream_entry name="co2tseries.SSP5-8.5.latbnd">
3846+
<stream_entry name="co2tseries.omip.jra">
40693847
<stream_meshfile>
40703848
<meshfile>none</meshfile>
40713849
</stream_meshfile>
40723850
<stream_datafiles>
4073-
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_lat-bandsSSP5-8.5__simyr_2014-2500_CMIP6_c190506.nc</file>
3851+
<file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_global_ssp585_simyr_1750-2020_CMIP6_c200324.nc</file>
40743852
</stream_datafiles>
40753853
<stream_datavars>
4076-
<var>CO2 Sa_co2diag</var>
3854+
<var>CO2 Sa_co2diag</var>
40773855
</stream_datavars>
40783856
<stream_lev_dimname>null</stream_lev_dimname>
40793857
<stream_mapalgo>
40803858
<mapalgo>none</mapalgo>
40813859
</stream_mapalgo>
40823860
<stream_vectors>null</stream_vectors>
4083-
<stream_year_align>2015</stream_year_align>
4084-
<stream_year_first>2015</stream_year_first>
4085-
<stream_year_last>2500</stream_year_last>
3861+
<stream_year_align>198</stream_year_align> <!-- 6*(2018-1958+1)-(2018-1850) -->
3862+
<stream_year_first>1850</stream_year_first>
3863+
<stream_year_last>2019</stream_year_last>
40863864
<stream_offset>0</stream_offset>
40873865
<stream_tintalgo>
40883866
<tintalgo>linear</tintalgo>
@@ -4096,6 +3874,7 @@
40963874
<stream_readmode>single</stream_readmode>
40973875
</stream_entry>
40983876

3877+
<!-- The future scenarios SSP (Shared Socio-economic Pathway) are CMIP6 era -->
40993878
<stream_entry name="co2tseries.SSP1-1.9">
41003879
<stream_meshfile>
41013880
<meshfile>none</meshfile>

‎drof/cime_config/testdefs/testlist_drof.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<testlist version="2.0">
33

4-
<test compset="2000_SATM_SLND_SICE_SOCN_DROF%NYF_SGLC_SWAV" grid="f19_g17_rx1" name="SMS_Ld3">
4+
<test compset="2000_SATM_SLND_SICE_SOCN_DROF%NYF_SGLC_SWAV" grid="TL319_t232_wt232" name="SMS_Ld3">
55
<machines>
66
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
77
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>

0 commit comments

Comments
 (0)