Skip to content

Cdeps 1850 aero co2 ndep updates #4008

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

Draft
ekluzek wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Cdeps 1850 aero co2 ndep updates #4008

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
203958e
Remove the cplhist testmod since CDEPS will now point to the case to …
ekluzek Apr 3, 2026
f7e9759
Remove the cplhist testmod from the testlist
ekluzek Apr 3, 2026
ee6aff1
Set CO2 to diagnostic for CPLHIST mode with CLM60, and set so that ND…
ekluzek Apr 5, 2026
61dc756
Add a Clm60 BgcCrop spinup compset
ekluzek Apr 5, 2026
657f12c
Merge branch 'master' into cdeps_1850_aero_co2_ndep_updates
ekluzek May 8, 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
2 changes: 2 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 @@ -303,6 +303,7 @@ Caveats:
<value compset="_BGC%BDRD" >diagnostic</value>
<value compset="_BGC%BPRP" >prognostic</value>
<value compset="HIST.*_DATM" >diagnostic</value>
<value compset="DATM%CPLHIST_CLM60" >diagnostic</value>
<value compset="SSP.*_DATM" >diagnostic</value>
</values>
<group>run_component_ctsm</group>
Expand Down Expand Up @@ -337,6 +338,7 @@ Caveats:
<default_value>FALSE</default_value>
<values>
<value compset="_CAM" >TRUE</value>
<value compset="1850_DATM%[^_]_CLM60">TRUE</value>
</values>
<group>run_component_ctsm</group>
<file>env_run.xml</file>
Expand Down
6 changes: 6 additions & 0 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,12 @@
<lname>1850_DATM%CPLHIST_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60BgcCropSpinup</alias>
<lname>1850_DATM%CPLHIST_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>


<!-- I CLM50 NWP Compsets -->

<!-- GSWP datm forcing, for global runs or regional runs outside the CONUS -->
Expand Down
6 changes: 3 additions & 3 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2549,7 +2549,7 @@
<option name="comment">Simple test to make sure the basic Fates-SP compset works"</option>
</options>
</test>
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/cplhist">
<test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="I1850Clm50BgcSpinup" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
Expand All @@ -2558,15 +2558,15 @@
<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"/>
<machine name="derecho" compiler="intel" category="matrixcn"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat last SMS_D_Ld1...cplhist test with matrixcnOn"</option>
<option name="comment">Repeat last SMS_D_Ld1...Spinup test with matrixcnOn"</option>
</options>
</test>
<test name="SMS_D_Ld1_PS" grid="f19_f19_mg17" compset="I2010Clm50Sp" testmods="clm/clm50cam6LndTuningMode--clm/nofireemis">
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.

Loading