Skip to content
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

Add option for CRUJRA2024 add some compsets for Clm60 for it as well as a corresponding compset for Clm5 #2956

Merged
merged 40 commits into from
Mar 17, 2025
+704 −36
Merged

Add option for CRUJRA2024 add some compsets for Clm60 for it as well as a corresponding compset for Clm5 #2956

Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
9079fc0
Update README
slevis-lmwg Feb 6, 2025
748f3cc
Update files in /bld
slevis-lmwg Feb 6, 2025
d9bac05
Update files in /cime_config
slevis-lmwg Feb 6, 2025
df8342b
Add TODO in subset_data.py
slevis-lmwg Feb 6, 2025
8b8f4b1
Update (correction?) to init_interp_attributes in namelist_defaults_ctsm
slevis-lmwg Feb 6, 2025
fc2bca5
Rm potentially confusing DATM%CRU_CLM60 compset (left in earlier CLMs)
slevis-lmwg Feb 7, 2025
fca4696
Added placeholder for clm5_0_CRUJRA2024 closest_tuning in buildnml
slevis-lmwg Feb 7, 2025
4d51e4d
Add clm5 compsets with explicit use of the Crujra datm inputs
slevis-lmwg Feb 8, 2025
49d39ce
Revisions part 1 from Erik's review
slevis-lmwg Feb 11, 2025
2fa3039
Revisions part 2 from Erik's review
slevis-lmwg Feb 11, 2025
2574252
Revisions part 3 from Erik's review
slevis-lmwg Feb 12, 2025
dd32dd2
Merge tag 'ctsm5.3.024' into mk_crujra_default
slevis-lmwg Feb 12, 2025
b6acc83
Update to share1.1.8 to avoid shr_sys_abort inconsistency
slevis-lmwg Feb 12, 2025
fbfe553
Updated subset_data: hardwired default datm_crujra, available datm_gswp3
slevis-lmwg Feb 14, 2025
ee875a0
Fix FUNIT test that started failing with share1.1.08
slevis-lmwg Feb 14, 2025
c1362c9
Update TODO comment in subset_data
slevis-lmwg Feb 14, 2025
ef8f3bd
Draft ChangeLog/ChangeSum
slevis-lmwg Feb 14, 2025
6b73ea2
Merge tag 'ctsm5.3.029' into mk_crujra_default
slevis-lmwg Mar 5, 2025
d54a247
Revert cmip compsets to gswp3 for b4b and add explicit crujra ones
slevis-lmwg Mar 5, 2025
1b62923
Change path to the CRUJRA2024 data for consistency with other datasets
slevis-lmwg Mar 7, 2025
cc5a640
Merge remote-tracking branch 'escomp/master' into mk_crujra_default
slevis-lmwg Mar 7, 2025
80d7deb
Correct compset typo for test to work
slevis-lmwg Mar 7, 2025
ce70c5b
Update to cdeps1.0.68 (identical to my cdeps mk_crujra_default branch)
slevis-lmwg Mar 10, 2025
3f229ca
Update ChangeLog/ChangeSum
slevis-lmwg Mar 10, 2025
b84d542
Update comments in subset_data.py and ChangeLog
slevis-lmwg Mar 10, 2025
24aa947
Update testlist_clm according to Erik's review
slevis-lmwg Mar 10, 2025
f82311a
Minor corrections to testlist_clm
slevis-lmwg Mar 10, 2025
13f2f46
More corrections to testlist_clm
slevis-lmwg Mar 11, 2025
3061876
Make compset aliases compatible with changes to tests
slevis-lmwg Mar 11, 2025
2271ccd
Update to latest CRUJRA2024 data path
slevis-lmwg Mar 11, 2025
9402dcc
Update to cdeps1.0.70
slevis-lmwg Mar 12, 2025
dd7d845
Update ChangeLog/Sum
slevis-lmwg Mar 12, 2025
4dcd7ec
Change comment in cime_config/config_component.xml
slevis-lmwg Mar 13, 2025
00ce0ce
Change list order in comment in cime_config/config_component.xml
slevis-lmwg Mar 13, 2025
8d7185d
Add exceptions to the comment describing lnd_tuning_mode
slevis-lmwg Mar 13, 2025
c608286
Change list order in comment in namelist_definition_ctsm.xml
slevis-lmwg Mar 13, 2025
3e6945f
Remove large number of Crujra compsets/tests deemed not necessary
slevis-lmwg Mar 13, 2025
58966dd
Merge remote-tracking branch 'escomp/master' into mk_crujra_default
slevis-lmwg Mar 14, 2025
e7707c3
Bug-fix of mistake in 3e6945f that caused tests to fail
slevis-lmwg Mar 14, 2025
5465422
Updated ChangeLog/Sum
slevis-lmwg Mar 17, 2025
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Remove large number of Crujra compsets/tests deemed not necessary
@slevis-lmwg
slevis-lmwg committed Mar 13, 2025

Verified

This commit was signed with the committer’s verified signature.
CodeDoctorDE CodeDoctor
GPG key ID: 5AF3F23DE97BBBDE
Verified
Learn about vigilant mode
commit 3e6945f99003f3e643b3b725496a04704cdcbabe
29 changes: 0 additions & 29 deletions cime_config/config_compsets.xml
View file
Original file line number Diff line number Diff line change
@@ -162,12 +162,6 @@
<science_support grid="f09_g17"/>
<science_support grid="f19_g17"/>
</compset>
<compset>
<alias>I1850Clm50SpCrujra</alias>
<lname>1850_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_t232"/>
<science_support grid="f19_g17"/>
</compset>

<compset>
<alias>I1850Clm50SpCru</alias>
@@ -256,10 +250,6 @@
<science_support grid="f09_g17"/>
<science_support grid="f19_g17"/>
</compset>
<compset>
<alias>I1850Clm50BgcCropCrujra</alias>
<lname>1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<!-- latest CLM version with BGC-Crop and CRU forcing -->
<compset>
@@ -345,10 +335,6 @@
<alias>I1850Clm50Bgc</alias>
<lname>1850_DATM%GSWP3v1_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>I1850Clm50BgcCrujra</alias>
<lname>1850_DATM%CRUJRA2024_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I1850Clm60BgcNoAnthro</alias>
@@ -389,12 +375,6 @@
<science_support grid="f09_g17"/>
<science_support grid="f19_g17"/>
</compset>
<compset>
<alias>IHistClm50BgcCropCrujra</alias>
<lname>HIST_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_t232"/>
<science_support grid="f19_g17"/>
</compset>

<compset>
<alias>IHistClm60Sp</alias>
@@ -437,11 +417,6 @@
<science_support grid="f19_g17"/>
</compset>

<compset>
<alias>IHistClm50SpCrujra</alias>
<lname>HIST_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>IHistClm50SpCru</alias>
<lname>HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_g17"/>
@@ -719,10 +694,6 @@
<alias>I1850Clm50BgcCropG</alias>
<lname>1850_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
</compset>
<compset>
<alias>I1850Clm50BgcCropCrujraG</alias>
<lname>1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
</compset>

<compset>
<alias>IHistClm50BgcCropG</alias>
135 changes: 0 additions & 135 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
@@ -425,15 +425,6 @@
<option name="comment">Science support for I1850Clm50Sp at f09</option>
</options>
</test>
<test name="SMS_Ld1" grid="f09_t232" compset="I1850Clm50SpCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Repeat I1850Clm50Sp f09 test with t232 and Crujra while the defaults have not changed</option>
</options>
</test>
<test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm50Sp" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -443,15 +434,6 @@
<option name="comment">Science support for I1850Clm50Sp at f19</option>
</options>
</test>
<test name="SMS_Ld1" grid="f19_g17" compset="I1850Clm50SpCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Repeat I1850Clm50Sp f19 test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_Ld1" grid="f09_g17" compset="I1850Clm50SpCru" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -616,15 +598,6 @@
<option name="comment">Do a test similar to FXHIST starting at a 2005 start date, will interpoalte from the 2003 IC file</option>
</options>
</test>
<test name="SMS_Ln9_P256x3" grid="f19_g17" compset="IHistClm50SpCrujra" testmods="clm/waccmx_offline2005Start">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat test similar to FXHIST with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_D_Ln9_P128x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -805,15 +778,6 @@
<option name="comment">Science support for 1850 clm5_0 physics for BgcCrop wtih CISM at f09</option>
</options>
</test>
<test name="SMS" grid="f09_t232" compset="I1850Clm50BgcCropCrujraG" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with t232 and Crujra while the defaults have not changed</option>
</options>
</test>
<!-- clm5_0 physics workhorse resolution BGC science test list -->
<test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm50Bgc" testmods="clm/default">
<machines>
@@ -824,15 +788,6 @@
<option name="comment">Science support for 1850 clm5_0 physics for Bgc at f19</option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm50BgcCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_Ld5" grid="f09_g17" compset="I1850Clm50Bgc" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -842,15 +797,6 @@
<option name="comment">Science support for 1850 clm5_0 physics for Bgc at f09</option>
</options>
</test>
<test name="SMS_Ld5" grid="f09_t232" compset="I1850Clm50BgcCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with t232 and Crujra while the defaults have not changed</option>
</options>
</test>
<!-- clm6_0 physics workhorse resolution BGC science test list -->
<test name="SMS_Ld5" grid="f19_g17" compset="I1850Clm60Bgc" testmods="clm/default">
<machines>
@@ -896,15 +842,6 @@
<option name="wallclock">00:60:00</option>
</options>
</test>
<test name="ERP_D_Ld5" grid="ne30_g17" compset="I1850Clm50BgcCropCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:60:00</option>
<option name="comment">Repeat this ERP test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS" grid="ne3pg3_ne3pg3_mg37" compset="IHistClm60SpRs" testmods="clm/clm60cam7LndTuningMode--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -1133,15 +1070,6 @@
<option name="comment">Science support for Historical clm5_0 physics with BGC-Crop at f09</option>
</options>
</test>
<test name="SMS_Ld5" grid="f09_t232" compset="IHistClm50BgcCropCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with t232 and Crujra while the default have not changed</option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50BgcCrop" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -1151,15 +1079,6 @@
<option name="comment">Science support for Historical clm5_0 physics with BGC-Crop at f19</option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50BgcCropCrujra" testmods="clm/default">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
</options>
</test>
<!-- Historical clm6_0 physics BgcCrop science support -->
<test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60BgcCrop" testmods="clm/default">
<machines>
@@ -2538,15 +2457,6 @@
<option name="comment">Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm50SpCrujra" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat ARCTIC test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -2577,15 +2487,6 @@
<option name="comment">Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm50SpCrujra" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat ARCTICGRIS test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -2634,15 +2535,6 @@
<option name="comment">Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm50SpCrujra" testmods="clm/clm50cam7LndTuningMode_2013Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat CONUS test with Crujra while Gswp is still the default</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_2013Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -2672,15 +2564,6 @@
<option name="comment">Science support for historical clm5_0 physics with SP mode at f09</option>
</options>
</test>
<test name="SMS_Ld5" grid="f09_t232" compset="IHistClm50SpCrujra" testmods="clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with t232 and Crujra while the defaults have not changed</option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/default--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
@@ -2691,15 +2574,6 @@
<option name="comment">Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="IHistClm50SpCrujra" testmods="clm/default--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this science support test with Crujra while Gswp is still the default</option>
</options>
</test>
<!-- Historical science support for clm6_0 workhorse resolutions -->
<test name="SMS_Ld5" grid="f09_g17" compset="IHistClm60Sp" testmods="clm/default--clm/nofireemis">
<machines>
@@ -3311,15 +3185,6 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SSP_Ld4" grid="f09_t232" compset="I1850Clm50BgcCropCrujra" testmods="clm/ciso_rtmColdSSP">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">Repeat this SSP test with t232 and Crujra while the defaults have not changed</option>
</options>
</test>
<test name="SMS_D_Mmpi-serial_Ld5" grid="5x5_amazon" compset="I2000Clm60FatesRs" testmods="clm/FatesCold">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>