Skip to content

Move co2diag from 3hourly to daily for CPLHIST mode #402

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
ekluzek merged 5 commits into from
Apr 22, 2026
Merged

Move co2diag from 3hourly to daily for CPLHIST mode #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f6f671
For cplhist mode with the latest cmeps, move co2diag from 3hr avg fil…
ekluzek Apr 15, 2026
64294bf
Add a test for running in CPLHIST mode and one for creating CPLHIST d…
ekluzek Apr 17, 2026
f2d199c
Adjust CPLHIST tests so that they are just using DATM, make sure ther…
ekluzek Apr 21, 2026
0c2aa64
Other aux_cdeps tests aren't running with gnu compiler, so move this …
ekluzek Apr 21, 2026
76b3647
Remove settings that require a land component, as this won't run
ekluzek Apr 22, 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
3 changes: 2 additions & 1 deletion 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,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>
<valid_values>none,cplhist,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 @@ -178,6 +178,7 @@
<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>
<value compset="_DATM%CPLHIST">cplhist</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand Down
33 changes: 32 additions & 1 deletion datm/cime_config/stream_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
- The historical series are labeled as either CMIP6 or CMIP7 era
- The SSP future scenarios are all CMIP6 era data
========================
co2tseries.cplhist
co2tseries.cmip6_20tr
co2tseries.cmip7_20tr
co2tseries.omip.iaf
Expand Down Expand Up @@ -3812,6 +3813,37 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.cplhist">
<stream_meshfile>
<meshfile>$ATM_DOMAIN_MESH</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END" filename_advance_days='1'>$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.24h.avrg.%ymd-00000.nc</file>
</stream_datafiles>
<stream_datavars>
<var>atmImp_Sa_co2diag Sa_co2diag</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>3.0</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="co2tseries.omip.iaf">
<stream_meshfile>
<meshfile>none</meshfile>
Expand Down Expand Up @@ -5348,7 +5380,6 @@
<var>atmImp_Sa_pbot Sa_pbot</var>
<var>atmImp_Sa_dens Sa_dens</var>
<var>atmImp_Sa_pslv Sa_pslv</var>
<var>atmImp_Sa_co2diag Sa_co2diag</var>
<var>atmImp_Sa_co2prog Sa_co2prog</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
Expand Down
28 changes: 27 additions & 1 deletion datm/cime_config/testdefs/testlist_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,33 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="1850_DATM%CPLHIST_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mt232" name="SMS_Ld5" testmods="datm/cplhist">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Make sure CPLHIST mode will run</option>
</options>
</test>
<test compset="1850_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mt232" name="SMS_D_Ld5" testmods="datm/cplhist_create">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Make sure can run creating CPLHIST data to run DATM from with DEBUG on</option>
</options>
</test>
<test compset="1850_DATM%CRUJRA2024b_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mt232" name="ERS_Ld5" testmods="datm/cplhist_create">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
<option name="comment">Make sure can run creating CPLHIST data to run DATM from with DEBUG off</option>
</options>
</test>
Comment on lines +55 to +72
Copy link
Copy Markdown
Member

@billsacks billsacks Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like these tests for creating cplhist files belong in aux_cmeps, not aux_cdeps. They could still use datm, but they seem more about testing cmeps functionality, not cdeps functionality, so the time we'd want to run them is when making cmeps changes, not cdeps changes.

Also, I'd prefer to have a single test with debug mode on, to keep the test suite more trim and faster turnaround.

Copy link
Copy Markdown
Collaborator Author

@ekluzek ekluzek May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@billsacks This does make sense. I'll move this over to cmeps in a future update. I assume you mean the tests should be in the cmeps repository and not cdeps? As an easier change I could change the testlist name here from aux_cdeps to aux_cmeps. Would the latter be acceptable?

What I think we really need though is a test that create CPLHIST files and then uses them to run CDEPS. Since, this kind of test uses both CMEPS and CDEPS, it wasn't clear to me where it would belong. This would also need to be a new SystemTest that does both steps to make sure it all works.

Copy link
Copy Markdown
Member

@billsacks billsacks May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking both that the tests belong in aux_cmeps and also that they belong in the CMEPS repository rather than the CDEPS repository. I don't think it makes sense to define aux_cmeps tests in CDEPS because then adjusting the CMEPS testlist requires a change in CDEPS, which feels like a pain.

Good point about this being a step towards a test that does both steps of generating the data and then running with it. And then, yeah, at that point it isn't clear to me where this test should be defined - but probably it should appear in both the aux_cmeps and aux_cdeps test lists... my initial thought is that the python file defining the test would live in one of those repositories (if there's one that it interacts with most in terms of settings, it could be best in that repo), and then there would be tests defined in both aux_cdeps (defined in the cdeps repo) and aux_cmeps (defined in the cmeps repo).

<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
Expand Down Expand Up @@ -114,7 +141,6 @@
<test compset="1850_DATM%CRUJRA2024_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Ld5">
<machines>
<machine name="derecho" compiler="intel" category="aux_cdeps"/>
<machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
Copy link
Copy Markdown
Member

@billsacks billsacks Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove this?

Copy link
Copy Markdown
Collaborator Author

@ekluzek ekluzek May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like that was just a mistake. I did this in

64294bf

and I don't see a mention of it, so I'll put it back.

</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
Expand Down
6 changes: 6 additions & 0 deletions datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
./xmlchange DATM_CPLHIST_DIR="/glade/derecho/scratch/hannay/archive/b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330/cpl/hist/"
Copy link
Copy Markdown
Member

@billsacks billsacks Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be moved into inputdata and shouldn't be pointing to scratch space.

./xmlchange DATM_CPLHIST_CASE="b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330"
./xmlchange DATM_YR_START="101"
./xmlchange DATM_YR_END="101"
./xmlchange RUN_STARTDATE="0101-01-01"
./xmlchange DATM_PRESNDEP="clim_1850_cmip6"
5 changes: 5 additions & 0 deletions datm/cime_config/testdefs/testmods_dirs/datm/cplhist_create/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
./xmlchange DATM_CO2_TSERIES=cmip6_20tr
./xmlchange DATM_PRESO3=clim_1850
./xmlchange DATM_TOPO=observed
./xmlchange CCSM_BGC=CO2A

8 changes: 8 additions & 0 deletions datm/cime_config/testdefs/testmods_dirs/datm/cplhist_create/user_nl_cpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
histaux_atm2med_file1_enabled = .true.
histaux_atm2med_file2_enabled = .true.
histaux_atm2med_file3_enabled = .true.
histaux_atm2med_file4_enabled = .true.
histaux_atm2med_file5_enabled = .true.
histaux_atm2med_file5_history_n = 1
histaux_atm2med_file5_history_option = 'ndays'
histaux_atm2med_file5_ntperfile = 1
Loading