Skip to content

ctsm5.4.055: CDEPS/CMEPS updates for cplhist and 1850 ndep from DATM #4180

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

Open
ekluzek wants to merge 22 commits into
base: master
Choose a base branch
from
Open

ctsm5.4.055: CDEPS/CMEPS updates for cplhist and 1850 ndep from DATM #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3ab9b52
Update to cdeps version including important CPLHIST mode changes
ekluzek Aug 19, 2026
77f6993
Turn on CLM_NDEP_FROM_CPL for CPLHIST and point to a different CPLHIS…
ekluzek Aug 19, 2026
0ed1c8f
Merge tag 'ctsm5.4.052' into cdeps_updates_for_cplhist
ekluzek Aug 19, 2026
24ce1f6
Remove cplhist testmod because we'll just use the default cplhist for…
ekluzek Aug 20, 2026
dcbab7f
Update cdeps with more DATM checking in place
ekluzek Aug 20, 2026
01090dc
Actually remove the cplhist testmod
ekluzek Aug 20, 2026
69a95c7
OK, the Clm50 spinup compset doesn't have Crop on, so change it back
ekluzek Aug 20, 2026
325e95b
Another small update to cdeps
ekluzek Aug 20, 2026
5257fe2
Use CO2 from DATM for 1850 CPLHIST mode, and use ndep from DATM for 1850
ekluzek Aug 22, 2026
864560e
Update submodules to latest
ekluzek Aug 22, 2026
9f9df56
Update cdeps to latest
ekluzek Aug 22, 2026
4c58c6e
Merge tag 'ctsm5.4.053' into cdeps_updates_for_cplhist
ekluzek Aug 22, 2026
74095cb
The updated cmeps required share to be updated
ekluzek Aug 22, 2026
f5d3c5e
Update cdeps and cmeps based on code review
ekluzek Aug 25, 2026
c715fdf
Update cdeps to fix a XML syntax error
ekluzek Aug 25, 2026
f2e2fcc
Bring in a cime PR to be able to handle the difference between CESM a…
ekluzek Aug 29, 2026
d710764
Update cdeps with latest changes in responce to code review
ekluzek Aug 29, 2026
6e2110a
Mark black commits
ekluzek Aug 29, 2026
8ae0fc2
Update cime again
ekluzek Aug 29, 2026
a862526
Merge tag 'ctsm5.4.054' into cdeps_updates_for_cplhist
ekluzek Aug 31, 2026
d81727c
Update cime and cmeps
ekluzek Sep 2, 2026
148a46d
Remove the cime branch
ekluzek Sep 3, 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: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,7 @@ ac03492012837799b7111607188acff9f739044a
d858665d799690d73b56bcb961684382551193f4
c0c6da391ee359f2765439426f3a2a4593a95343
598de2f05638286b3d99ac0ed120977cbc554c3d
5bf360747080a1498664b6f0fd62d3d19838045b
3c6a4254a539c2b9cfdced8f796d8ffc85096b02
c4f81babe0aaa26250cca92de8118331e5676fdf
5e7346ad28be374735ff9200861d9526d3dbbf53
14 changes: 10 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,22 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.64
#url = https://github.com/ESCOMP/CMEPS.git
url = https://github.com/ekluzek/CMEPS.git
#fxtag = cmeps1.1.65
#branch = co2a_for_cplhist
fxtag = c336149ae8fc8697294ef9e46d6092dda6291936
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.105
#url = https://github.com/ESCOMP/CDEPS.git
url = https://github.com/ekluzek/CDEPS.git
#fxtag = cdeps1.0.105
#branch = 1850_aero_ndep_ozone
fxtag = 4a6f49ceb275512dac3adaa5176e957c1c4cad42
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
Expand Down
3 changes: 3 additions & 0 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ Caveats:
<value compset="_BGC%BDRD" >diagnostic</value>
<value compset="_BGC%BPRP" >prognostic</value>
<value compset="HIST.*_DATM" >diagnostic</value>
<value compset="1850.*_DATM%CPLHIST" >diagnostic</value>

@ekluzek ekluzek Aug 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The CO2 settings need to be consistent in CLM, DATM and CMEPS. There should be some error checking to check on that. There are various problems that happen if they aren't.

<value compset="SSP.*_DATM" >diagnostic</value>
</values>
<group>run_component_ctsm</group>
Expand Down Expand Up @@ -307,6 +308,8 @@ Caveats:
<default_value>FALSE</default_value>
<values>
<value compset="_CAM" >TRUE</value>
<value compset="_DATM%CPLHIST" >TRUE</value>

@ekluzek ekluzek Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmmm. Should this just be for 1850 and with CLM60 or all the time? We assume CPLHIST data in CDEPS come from recent cases likely run with CLM60, so this is probably right...

<value compset="1850_.*CLM60" >TRUE</value>
</values>
<group>run_component_ctsm</group>
<file>env_run.xml</file>
Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2800,7 +2800,7 @@
<option name="comment">Simple test to make sure the basic FatesSp compset works"</option>
</options>
</test>
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm60BgcCropSpinup" testmods="clm/cplhist">
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm60BgcCropSpinup" testmods="clm/crop">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
Expand All @@ -2810,7 +2810,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist--clm/matrixcnOn">
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default--clm/matrixcnOn">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/clm/cplhist/include_user_mods
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions cime_config/testdefs/testmods_dirs/clm/cplhist/shell_commands
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion components/cdeps
Open in desktop
Submodule cdeps updated 5 files
+166 −32 datm/cime_config/buildnml
+28 −4 datm/cime_config/config_component.xml
+39 −3 datm/cime_config/stream_definition_datm.xml
+1 −1 datm/cime_config/testdefs/testlist_datm.xml
+0 −6 datm/cime_config/testdefs/testmods_dirs/datm/cplhist/shell_commands
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated from 2d9b7d to c33614
Loading