Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
d9f75e9
Set defaults for DATM_CPLHIST_* settings for 1850 with DATM coupled t…
ekluzek Apr 4, 2026
67a8f18
Make the default setting for DATM_CPLHIST_DIR under the users archive…
ekluzek Apr 4, 2026
fcb28ad
Correct the filenames for cplhist mode for PRES_NDEP
ekluzek Apr 4, 2026
a72518b
Add clim_1850_cesm3_for_cmip7
ekluzek Apr 5, 2026
b6ebc5c
Add clim_1850_cesm3_for_cmip7
ekluzek Apr 5, 2026
ab6e2d7
CPLHIST settings for CLM should be just CLM60, to preserve older answers
ekluzek Apr 5, 2026
82e13db
Merge tag 'cdeps1.0.94' into 1850_aero_ndep_ozone
ekluzek Apr 22, 2026
acebf06
Merge branch 'main' into 1850_aero_ndep_ozone
ekluzek May 21, 2026
c22f68b
Merge tag 'cdeps1.0.105' into 1850_aero_ndep_ozone
ekluzek Aug 18, 2026
07b976f
Needed to get the right variables for ndep in cplhist mode
ekluzek Aug 19, 2026
2e0473f
Spin off some functions to modularize the code, to make way for addin…
ekluzek Aug 19, 2026
6fb38a9
Add headers to new functions, and do suggestions from co-pilots revie…
ekluzek Aug 19, 2026
2523ab1
Do error checking for CPLHIST mode, this resolves #399
ekluzek Aug 20, 2026
3f51f39
Let 1850 cases with CLM60 use cmip7_20tr for CO2 timeseries
ekluzek Aug 20, 2026
7842d5a
Missing for PTS_LAT/LON was actually -999.99 so set it to a variable …
ekluzek Aug 20, 2026
00dbb60
Add some output expects for _handle_model_grid especially for the NEO…
ekluzek Aug 20, 2026
03abec7
Set the default case for CPLHIST with 1850 and CLM60 to a recent case…
ekluzek Aug 20, 2026
3dd89db
No longer need to set DATM_PRESNDEP for CPLHIST case
ekluzek Aug 20, 2026
b1aaf13
Have to add logic depending on the LND model since some variables are…
ekluzek Aug 21, 2026
b6d4096
Merge commit 'b1aaf13' into 1850_aero_ndep_ozone
ekluzek Aug 21, 2026
1a200c9
Remove debug print statement that shouldn't be there
ekluzek Aug 21, 2026
9b3b5a6
Make align, start, end for the CPLHIST default consistently 101
ekluzek Aug 21, 2026
7faa9cd
Update CO2 dataset fixing #410
ekluzek Aug 21, 2026
0aef11e
Set the ndep default file for 1850 to the preliminary one
ekluzek Aug 21, 2026
9e73166
Backout setting CO2 to cmip7_20tr until we have clim_cmip7_1850 options
ekluzek Aug 22, 2026
b03bd5b
Only thing needed now is to the start the run start year, the others …
ekluzek Aug 22, 2026
ca485b5
Restrict setting of cplhist for DATM_CO2_TSERIES to only if DATM%CPLH…
ekluzek Aug 25, 2026
ec8c0a1
Remove cplhist testmod as realized in code review
ekluzek Aug 25, 2026
8106de7
Set YR_ALIGN for CPLHIST to 1, as the normal thing is to start with y…
ekluzek Aug 25, 2026
816b01f
Fix XML syntax error
ekluzek Aug 25, 2026
967ef1f
Simple changes from code review adding more to docstrings, and combin…
ekluzek Aug 26, 2026
339bf37
Update datm/cime_config/config_component.xml
ekluzek Aug 26, 2026
458df47
Update datm/cime_config/config_component.xml
ekluzek Aug 26, 2026
56a9e5e
Update datm/cime_config/config_component.xml
ekluzek Aug 26, 2026
4d0489a
Update datm/cime_config/config_component.xml
ekluzek Aug 26, 2026
1083247
Update datm/cime_config/config_component.xml
ekluzek Aug 26, 2026
7d61189
A couple things caught in the code review, fix a typo, and remove a c…
ekluzek Aug 26, 2026
2951f37
Merge branch '1850_aero_ndep_ozone' of github.com:ekluzek/CDEPS into …
ekluzek Aug 26, 2026
18c23f1
More things from review, remove checking if DATM_CPLHIST_DOMAIN_FILE …
ekluzek Aug 26, 2026
07846d8
Fix expect so that PLUMBER2 sites work
ekluzek Aug 26, 2026
baddde6
Add a note on how ndep for cplhist is in units that don't need to be …
ekluzek Aug 27, 2026
93d3b15
Add a comment about the clim_1850_cesm3_for_cmip7 option to DATM_PRES…
ekluzek Aug 27, 2026
1b961f0
Remove accidental character that screwed up the XML syntax, and adjus…
ekluzek Aug 29, 2026
4a6f49c
Add coupling_mode as an attribute for the cesm settings that could co…
ekluzek Aug 29, 2026
16c24bd
Update to cdeps1.0.106
ekluzek Sep 3, 2026
22b6a65
Merge tag 'cdeps1.0.106' into 1850_aero_ndep_ozone
ekluzek Sep 3, 2026
1ffb371
Remove the coupled_mode attribute, because we aren't doing the cime u…
ekluzek Sep 3, 2026
0841d06
Shorten clim_1850_cesm3_for_cmip7 to clim_1850_cesm3 as suggested in …
ekluzek Sep 3, 2026
5d65471
Add some comments clarify on what the different NDEP source types are
ekluzek Sep 3, 2026
b83980a
Fix grammar in a comment
ekluzek Sep 3, 2026
d78c9de
From code review, don't do these changes for just CLM, as we want MOM…
ekluzek Sep 3, 2026
027cd71
Distinguish between CESM3 and NorESM settings by adding an option arg…
ekluzek Sep 4, 2026
2a02e03
Move this back to the setting for CO2 default to be cplhist with DATM…
ekluzek Sep 4, 2026
2cc9430
Change CPLHIST tests to use %CESM3 and add some extra tests for %CESM…
ekluzek Sep 4, 2026
da74bac
Change subdirectory from atm to 'cpl/hist' as requested in review to …
ekluzek Sep 4, 2026
d58728e
Add some notes about the 1850 NDEP options and set to cmip6 for CLM50
ekluzek Sep 4, 2026
5efd094
Remove a bunch of expects as requested in the code review
ekluzek Sep 9, 2026
2a335a2
Work on notes about dataset specifier, and add some notes around it f…
ekluzek Sep 9, 2026
ac8519e
Some clarifications
ekluzek Sep 10, 2026
adb70c0
Add CMIP6 and CMIP7 to option list, and clarify some of the comments …
ekluzek Sep 10, 2026
e289f66
Add the units conversion
ekluzek Sep 10, 2026
29255af
Move CPLHIST for CESM from CPLHIST%CESM3 form to CPLHIST-CESM3, so it…
ekluzek Sep 11, 2026
c25b7df
Add some more clarity to the current proposal for chemical constituen…
ekluzek Sep 11, 2026
1f23565
Apply suggestion from @billsacks on the reg-EX matching for NDEP
ekluzek Sep 11, 2026
27dfbbf
Add some tests for transient CMIP7 NDEP data, change CPLHIST%CESM3 to…
ekluzek Sep 11, 2026
f28c113
Back out the changes about the dataset specifier for chemical constit…
ekluzek Sep 11, 2026
84c436e
Remove trailing whitespace
ekluzek Sep 11, 2026
882010f
Remove more left over changes documenting the change now backed out, …
ekluzek Sep 11, 2026
9fe3ae1
Add testmods to test the variety of datasets and add tests for them all
ekluzek Sep 11, 2026
e1482bc
Add testmods to test the variety of datasets and add tests for them all
ekluzek Sep 11, 2026
4ff8acd
Missing component name in testmods
ekluzek Sep 11, 2026
b2b6514
Make the case for CO2 on the cmip7 file in upper case
ekluzek Sep 13, 2026
ab2654e
Document that year start and end for CPLHIST-CESM3 is expected to be …
ekluzek Sep 13, 2026
ec82648
Update comment from code review
ekluzek Sep 13, 2026
e3e93c9
Remove the test that was intended to be cplhist_create with CESM3 NDE…
ekluzek Sep 13, 2026
c318f83
Remove the second hist_cmip7_ndep_and_co2 and just do the CRUJRA2024 …
ekluzek Sep 14, 2026
eac6c05
Remove the GSWP3 1850_cesm3_ndep test and just leave the one for CRUJ…
ekluzek Sep 14, 2026
9b7f966
Correction from code review
ekluzek Sep 14, 2026
e13695a
The matching on DATM wasn't needed in DATM_PRESNDEP so removing as re…
ekluzek Sep 14, 2026
ead9b82
Add comment about the generic matching to DATM%CPLHIST from code review
ekluzek Sep 14, 2026
ec95697
Fix logic and quote UNSET as caught in the code review
ekluzek Sep 14, 2026
79f0e13
Don't trigger on if the compset has CLM or not, trigger based on if c…
ekluzek Sep 14, 2026
0302402
Correct that available_neon_data is normally None rather than an empt…
ekluzek Sep 14, 2026
8836d64
Correction about PLUMBER2SITE from code review
ekluzek Sep 14, 2026
ec5e769
Fix the bit caught in code review that CLM_USRDAT_NAME can NOT be set…
ekluzek Sep 14, 2026
765d8b7
Run through black
ekluzek Sep 14, 2026
4f4bf83
Initialize single_column to false, and allow CLM_USRDAT_NAME to be th…
ekluzek Sep 14, 2026
3277096
Merge branch 'main' into 1850_aero_ndep_ozone
ekluzek Sep 14, 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
457 changes: 352 additions & 105 deletions datm/cime_config/buildnml

Large diffs are not rendered by default.

94 changes: 62 additions & 32 deletions datm/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
'+' 1 or more modifiers

This file may have atm desc entries.

Attributes that can be used for entry tags defined in cime:
grid, compset, cime_model
-->
<description modifier_mode="1">
<desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%CRUJRA2024b][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF6162][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
<desc atm="DATM[%QIA][%WISOQIA][%CRUJRA2024][%CRUJRA2024b][%CRUv7][%GSWP3v1][%MOSARTTEST][%NLDAS2][%CPLHIST][%CPLHIST-CESM3][%1PT][%NYF][%IAF][%JRA][%JRA-1p4-2018][%JRA-1p5-2023][%JRA-RYF6162][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%SIMPLE]"> Data driven ATM </desc>
<desc option="QIA"> QIAN data set </desc>
<desc option="WISOQIA">QIAN with water isotopes</desc>
<desc option="CRUJRA2024"> CRUJRA 2024 data set </desc>
Expand All @@ -19,6 +22,7 @@
<desc option="GSWP3v1"> GSWP3v1 data set </desc>
<desc option="NLDAS2"> NLDAS2 regional 0.125 degree data set over the U.S. (25-53N, 235-293E). WARNING: Garbage data will be produced for runs extending beyond this regional domain. </desc>
<desc option="CPLHIST"> Coupler hist data set (in this mode, it is strongly recommended that the model domain and the coupler history forcing are on the same domain)</desc>
<desc option="CPLHIST-CESM3"> Coupler hist data set with CESM3.0 specific spinup datasets </desc>
<desc option="1PT">single point tower site data set </desc>
<desc option="NYF">COREv2 normal year forcing</desc>
<desc option="IAF">COREv2 interannual forcing</desc>
Expand All @@ -44,7 +48,7 @@

<entry id="DATM_MODE">
<type>char</type>
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,CLMCRUJRA2024b,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,CORE_RYF6162_JRA,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,ERA5,SIMPLE</valid_values>
<valid_values>CORE2_NYF,CORE2_IAF,CLM_QIAN,CLM_QIAN_WISO,1PT,CLMCRUJRA2024,CLMCRUJRA2024b,CLMCRUNCEPv7,CLMGSWP3v1,CLMNLDAS2,CPLHIST,CPLHIST-CESM3,CORE_IAF_JRA,CORE_IAF_JRA_1p4_2018,CORE_IAF_JRA_1p5_2023,CORE_RYF6162_JRA,CORE_RYF8485_JRA,CORE_RYF9091_JRA,CORE_RYF0304_JRA,ERA5,SIMPLE</valid_values>
<default_value>CORE2_NYF</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand All @@ -71,6 +75,7 @@
<value compset="DATM%NLDAS2">CLMNLDAS2</value>
<value compset="DATM%1PT">1PT</value>
<value compset="DATM%ERA5">ERA5</value>
<!-- NOTE: This match captures both a simple DATM%CPLHIST and qualified variants like DATM%CPLHIST-CESM3, using the same mode for all of them -->
<value compset="DATM%CPLHIST">CPLHIST</value>
<value compset="DATM%SIMPLE">SIMPLE</value>
</values>
Expand All @@ -93,7 +98,7 @@
<value compset="^SSP534_" >SSP5-3.4</value>
<value compset="^SSP585_" >SSP5-8.5</value>
<value compset="^HIST_" >hist</value>
<value compset="^20TR_" >hist</value>
<!-- NOTE: This match captures both a simple DATM%CPLHIST and qualified variants like DATM%CPLHIST-CESM3, using the same mode for all of them -->
<value compset="_DATM%CPLHIST">cplhist</value>
Comment thread
billsacks marked this conversation as resolved.
<value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
</values>
Expand All @@ -104,19 +109,29 @@

<entry id="DATM_PRESNDEP">
<type>char</type>
<valid_values>none,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
<!-- NOTE: Here clim_1850_cesm3 means the 1850 climatological dataset that CESM3.0 will use for CMIP7 that is from it's spinup simulation -->
<!-- In contrast clim_1850_cmip7 is the 1850 data provided by CMIP7 -->
<valid_values>none,clim_1850_cesm3,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
<default_value>clim_2000</default_value>
<values match="last">
Comment thread
ekluzek marked this conversation as resolved.
<value compset="^1850_" >clim_1850_cmip6</value>
<value compset="^2000_" >clim_2000_cmip6</value>
<value compset="^2010_" >clim_2010_cmip6</value>
<value compset="^HIST_" >hist_cmip6</value>
<value compset="^20TR_" >hist_cmip6</value>
<value compset="^SSP126_" >SSP1-2.6</value>
<value compset="^SSP245_" >SSP2-4.5</value>
<value compset="^SSP370_" >SSP3-7.0</value>
<value compset="^SSP585_" >SSP5-8.5</value>
<value compset="_DATM%CPLHIST">cplhist</value>
<!-- NorESM will use the CMIP7 dataset
Commented out as we don't currently have a way to distinguish between CESM3 and NorESM3 right now
<value compset="^1850_" >clim_1850_cmip7</value>
-->
<!-- CESM3 uses the CESM3 spinup dataset -->
<value compset="^1850_" >clim_1850_cesm3</value>
<!-- Use cmip6 when using CLM5 physics -->
<value compset="^1850_.*_CLM50" >clim_1850_cmip6</value>

<value compset="^2000_" >clim_2000_cmip6</value>
<value compset="^2010_" >clim_2010_cmip6</value>
<value compset="^HIST_" >hist_cmip6</value>
<value compset="^SSP126_" >SSP1-2.6</value>
<value compset="^SSP245_" >SSP2-4.5</value>
<value compset="^SSP370_" >SSP3-7.0</value>
<value compset="^SSP585_" >SSP5-8.5</value>
<!-- NOTE: This match captures both a simple DATM%CPLHIST and qualified variants like DATM%CPLHIST-CESM3, using the same mode for all of them -->
<value compset="_DATM%CPLHIST" >cplhist</value>
<value compset="_DATM.*_DICE.*_DOCN.*_DROF">none</value>
</values>
<group>run_component_datm</group>
Expand All @@ -136,7 +151,6 @@
<value compset="^SSP370_" >SSP3-7.0</value>
<value compset="^SSP585_" >SSP5-8.5</value>
<value compset="^HIST_" >hist</value>
<value compset="^20TR_" >hist</value>
<!-- Only needed for compsets with active land; only in DATM CLMNCEP mode -->
<value compset="_SLND">none</value>
<value compset="_DLND">none</value>
Expand All @@ -154,6 +168,7 @@
<!-- Only needed for compsets with active land; for other compsets, turn it off -->
<value compset="_SLND">none</value>
<value compset="_DLND">none</value>
<!-- NOTE: This match captures both a simple DATM%CPLHIST and qualified variants like DATM%CPLHIST-CESM3, using the same mode for all of them -->
<value compset="_DATM%CPLHIST">cplhist</value>
</values>
<group>run_component_datm</group>
Expand All @@ -175,14 +190,18 @@
<value compset="^SSP534_">SSP5-3.4</value>
<value compset="^SSP585_">SSP5-8.5</value>
<value compset="^HIST_" >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>
<!-- NOTE: This match captures both a simple DATM%CPLHIST and qualified variants like DATM%CPLHIST-CESM3, using the same mode for all of them -->
<value compset="_DATM%CPLHIST">cplhist</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>DATM CO2 time series</desc>
<desc>DATM CO2 time series
NOTE: This needs to be coordinated with CCSM_BGC in CMEPS, and with either the ocean or land model
For CLM coordinate it with the CLM_CO2_TYPE variable
For MOM coordinate it with the OCN_CO2_TYPE variable
</desc>
Comment thread
ekluzek marked this conversation as resolved.
</entry>

<entry id="DATM_CPLHIST_DOMAIN_FILE">
Expand All @@ -205,15 +224,30 @@
<type>char</type>
<valid_values></valid_values>
<default_value>UNSET</default_value>
<values match="last">
<value compset="1850.*_DATM%CPLHIST-CESM3">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/cpl/hist</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>directory for coupler history data mode (only used for when DATM_MODE is CPLHIST)</desc>
<desc>
Directory for coupler history data mode (used when DATM_MODE is CPLHIST)
May also be used if any of these are set to cplhist: DATM_PRESAERO, DATM_NDEP, DATM_CO2_TSERIES, DATM_PRESO3, or DATM_TOPO
NOTE: This needs to be the full directory path where the CPLHIST files are stored, including the subdirectory for the CASENAME (that can be set using $DATM_CPLHIST_CASE)
We thus recommend that $DATM_CPLHIST_CASE be used in here to specify that case subdirectory.
This allows the DATM_CPLHIST_DIR to be set for all your CPLHIST datafiles, and you only need to modify $DATM_CPLHIST_CASE to point to a different CASE.
For example, to use the CPLHIST data generated from a case that you ran do this:
./xmlchange DATM_CPLHIST_DIR='$CIME_OUTPUT_ROOT/archive/$DATM_CPLHIST_CASE/cpl/hist'
Which will then use the CPL history files in your archive directory for the case that created the desired CPLHIST data.
</desc>
</entry>

<entry id="DATM_CPLHIST_CASE">
<type>char</type>
<valid_values></valid_values>
<default_value>UNSET</default_value>
<values match="last">
<value compset="1850.*_DATM%CPLHIST-CESM3">b.e30_alpha08o.B1850C_MTso.ne30_t232_wgx3.330</value>
</values>
Comment thread
billsacks marked this conversation as resolved.
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>case name used to determine stream filenames when DATM_MODE is CPLHIST</desc>
Expand All @@ -234,10 +268,6 @@
<value compset="HIST.*_DATM%CRUv7">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="HIST.*_DATM%NLDAS2">$DATM_YR_START</value>
<value compset="20TR.*_DATM%QIA">1895</value>
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1901</value>
<value compset="20TR.*_DATM%CRUv7">1901</value>
<value compset="20TR.*_DATM%GSW">1901</value>
<value compset="SSP.*_DATM%QIA">$DATM_YR_START</value>
<value compset="SSP.*_DATM%CRUJRA2024[b]*">$DATM_YR_START</value>
<value compset="SSP.*_DATM%CRUv7">$DATM_YR_START</value>
Expand Down Expand Up @@ -278,18 +308,18 @@
<value compset="1850.*_DATM%CRUv7">1901</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="1850.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<!-- Year start for CPLHIST with CESM3 spinup: give default, and also years for CLM and MOM (which will be different) -->
<value compset="1850.*_DATM%CPLHIST-CESM3">101</value>
<value compset="1850.*_DATM%CPLHIST-CESM3.*_CLM">101</value>
<value compset="1850.*_DATM%CPLHIST-CESM3.*_MOM6">101</value>
Comment thread
billsacks marked this conversation as resolved.

<value compset="2000.*_DATM%WISOQIA">2000</value>
<value compset="2000.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%QIA">1948</value>
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
<value compset="HIST.*_DATM%CRUv7">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="HIST.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="20TR.*_DATM%QIA">1948</value>
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1901</value>
<value compset="20TR.*_DATM%CRUv7">1901</value>
<value compset="20TR.*_DATM%GSW">1901</value>
<value compset="20TR.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="4804.*_DATM%QIA">1948</value>
<value compset="SSP.*_DATM%QIA" >1995</value>
<value compset="SSP.*_DATM%CRUJRA2024[b]*" >2001</value>
Expand Down Expand Up @@ -349,18 +379,18 @@
<value compset="1850.*_DATM%CRUv7">1920</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="1850.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<!-- Year end for CPLHIST with CESM3 spinup: give default, and also years for CLM and MOM (which will be different) -->
<value compset="1850.*_DATM%CPLHIST-CESM3">101</value>
<value compset="1850.*_DATM%CPLHIST-CESM3.*_CLM">101</value>
<value compset="1850.*_DATM%CPLHIST-CESM3.*_MOM6">101</value>
Comment thread
billsacks marked this conversation as resolved.

<value compset="2000.*_DATM%WISOQIA">2004</value>
<value compset="2000.*_DATM%QIA">2004</value>
<value compset="HIST.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1920</value>
<value compset="HIST.*_DATM%CRUv7">1920</value>
<value compset="HIST.*_DATM%GSW">1920</value>
<value compset="HIST.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="20TR.*_DATM%QIA">1972</value>
<value compset="20TR.*_DATM%CRUJRA2024[b]*">1920</value>
<value compset="20TR.*_DATM%CRUv7">1920</value>
<value compset="20TR.*_DATM%GSW">1920</value>
<value compset="20TR.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="4804.*_DATM%QIA">2004</value>
<value compset="SSP.*_DATM%QIA">2004</value>
<value compset="SSP.*_DATM%CRUJRA2024[b]*">2023</value>
Expand Down
44 changes: 41 additions & 3 deletions datm/cime_config/stream_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
optional stream nitrogen deposition
- DATM_NDEP is set by the 4 character time prefix in config_component.xml
========================
presndep.clim_1850_cesm3
presndep.clim_1850_cmip7
presndep.clim_2000_cmip7
presndep.clim_2010_cmip7
Expand Down Expand Up @@ -3788,10 +3789,10 @@
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022_CMIP7_c20250228.nc</file>
<file>$DIN_LOC_ROOT/atm/datm7/CO2/co2_input4MIPs_GHGConcentrations_CMIP_CR-CMIP-1-0-0_gm_1750-2022_CMIP7_c20260601.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>
Expand Down Expand Up @@ -4784,6 +4785,7 @@
<!-- presndep forcing streams -->
<!-- ===================-->

<!-- Nitrogen deposition data provided by CMIP7 -->
<stream_entry name="presndep.clim_1850_cmip7">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_ESMFmesh_cdf5_c20251211.nc</meshfile>
Expand Down Expand Up @@ -4924,6 +4926,41 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- Climatological NDEP data from a CESM30 1850 case -->
<stream_entry name="presndep.clim_1850_cesm3">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/cam/chem/trop_strat_mam5_ts4_aero_spinup/ndep/fndep_clm_B1850C_MT4s.1850monthly.ne30_c251220.nc</file>
Comment thread
ekluzek marked this conversation as resolved.
</stream_datafiles>
<stream_datavars>
<!-- the following stream fields are in units of g/m2/sec - need conversion to kg/m2/sec-->
Comment thread
ekluzek marked this conversation as resolved.
<var>NDEP_NHx_month Faxa_ndep_nhx 1.0d-3</var>
<var>NDEP_NOy_month Faxa_ndep_noy 1.0d-3</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>1</stream_year_align>
<stream_year_first>1850</stream_year_first>
<stream_year_last>1850</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>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- Climatological NDEP data from a CESM20 1850 case used for CMIP6 -->
<stream_entry name="presndep.clim_1850_cmip6">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
Expand Down Expand Up @@ -5056,6 +5093,7 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- NDEP data from a CESM21 future scenario (i.e. Shared Socioeconomic Pathway (SSP)) case used for CMIP6 -->
<stream_entry name="presndep.SSP1-2.6">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
Expand Down Expand Up @@ -5272,7 +5310,7 @@
<meshfile>$ATM_DOMAIN_MESH</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.24h.avrg.%ymd.nc</file>
<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>
<!-- the mediator writes the two ungridded elements of Faxa_ndep as
Expand Down
Loading
Loading