Skip to content

Update FATES testdefs so that we use the compset instead of a testmod directory #1827

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
merged 8 commits into from
Oct 15, 2022
Merged

Update FATES testdefs so that we use the compset instead of a testmod directory #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0824a12
update SatPhen test defs files
Aug 9, 2022
8cde3fe
fixing some other SP issues
adrifoster Aug 11, 2022
f7223e0
reverting some changes
adrifoster Aug 12, 2022
ee553ef
update testdef for the one of the FATES SP smoke tests
adrifoster Aug 12, 2022
f2019f5
put back call to fates_sp usermods
adrifoster Aug 15, 2022
2275289
add back fates_sp user mods call
adrifoster Aug 15, 2022
b6c239c
changed order of include mods
adrifoster Aug 16, 2022
695ee13
update for DAMP
adrifoster Aug 24, 2022
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
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 @@ -2298,13 +2298,13 @@
</options>
</test>
-->
<test name="SMS_Ld30" grid="f45_f45_mg37" compset="I2000Clm51FatesSpCruRsGs" testmods="clm/FatesColdDefReducedComplexSatPhen">
<test name="SMS_Lm1" grid="f45_f45_mg37" compset="I2000Clm51FatesSpCruRsGs" testmods="clm/FatesColdDefBasic">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">Temporary smoke test. This test should be removed once the ERS version of this test passes COMPARE_base_rest</option>
<option name="comment">Smoke test that uses just the FATES SP compset.</option>
</options>
</test>
<test name="ERS_Ld30" grid="f45_f45_mg37" compset="I2000Clm51FatesSpCruRsGs" testmods="clm/FatesColdDefReducedComplexSatPhen">
Expand Down
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefBasic/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange CLM_FORCE_COLDSTART="on"
./xmlchange BFBFLAG="TRUE"
3 changes: 1 addition & 2 deletions ...nfig/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
../FatesColdDefDryDep
../FatesColdDefReducedComplexSatPhen
../FatesColdDefBasic
3 changes: 3 additions & 0 deletions ..._config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
./xmlchange CLM_BLDNML_OPTS='--drydep' --append
# The following would be required if you want to run with DryDep and FATES without Fates-SP mode
#./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append
4 changes: 4 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefDryDepReducedComplexSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

hist_mfilt = 365
hist_nhtfrq = -24

3 changes: 1 addition & 2 deletions ...onfig/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
../FatesColdDefMegan
../FatesColdDefReducedComplexSatPhen
../FatesColdDefBasic
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange CLM_BLDNML_OPTS='--megan' --append
./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append
4 changes: 4 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefMeganReducedComplexSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

hist_mfilt = 365
hist_nhtfrq = -24

5 changes: 3 additions & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
../FatesColdDef
../../../../usermods_dirs/fates_sp
../FatesColdDefBasic


6 changes: 4 additions & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdDefReducedComplexSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
use_fates_sp = .true.
fates_spitfire_mode = 0

hist_mfilt = 365
hist_nhtfrq = -24