Skip to content

Commit ac7aa64

Browse files
committed
Add SystemTest for FATES functional tests.
1 parent e425ffc commit ac7aa64

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/samsrabin/fates
31-
fxtag = c6ad0e63bcad0d0ab0ce8e19d04d812c584ad970
31+
fxtag = 3b4732335bdd771f8781205637a3769728c27fb5
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NGEET/fates

cime_config/config_tests.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ This defines various CTSM-specific system tests
2424
<DOUT_S>FALSE</DOUT_S>
2525
</test>
2626

27+
<test NAME="FUNCTIONALFATES">
28+
<DESC>Run FATES's Fortran functional tests. Grid and compset (and most case settings) are ignored.</DESC>
29+
<INFO_DBUG>1</INFO_DBUG>
30+
<STOP_OPTION>ndays</STOP_OPTION>
31+
<STOP_N>11</STOP_N>
32+
<CHECK_TIMING>FALSE</CHECK_TIMING>
33+
<DOUT_S>FALSE</DOUT_S>
34+
</test>
35+
2736
<test NAME="MKSURFDATAESMF">
2837
<DESC>Build and run the mksurfdata_esmf tool to generate a new fsurdat; then run the CTSM with this fsurdat</DESC>
2938
<INFO_DBUG>1</INFO_DBUG>

cime_config/testdefs/testlist_clm.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4151,7 +4151,22 @@
41514151
</machines>
41524152
<options>
41534153
<option name="wallclock">00:30:00</option>
4154-
<option name="comment">This test runs FATES's Fortran unit tests. We're abusing the system test infrastructure to run these, so that a run of the test suite results in the unit tests being run as well. Grid and compset are irrelevant here, except that compset must be one that includes FATES in order for CIME to find the test definition.</option>
4154+
<option name="comment">This test runs FATES's Fortran unit tests. We're abusing the system test infrastructure to run these, so that a run of the test suite results in the unit tests being run as well. Grid and compset are irrelevant here, except that compset must be one that includes CTSM in order for CIME to find the test definition.</option>
4155+
</options>
4156+
</test>
4157+
4158+
<test name="FUNCTIONALFATES_P1x1" grid="f10_f10_mg37" compset="I2000Clm50Sp">
4159+
<machines>
4160+
<machine name="derecho" compiler="intel" category="aux_clm"/>
4161+
<machine name="izumi" compiler="intel" category="aux_clm"/>
4162+
<machine name="derecho" compiler="intel" category="fates"/>
4163+
<machine name="izumi" compiler="intel" category="fates"/>
4164+
<machine name="derecho" compiler="intel" category="unit_tests"/>
4165+
<machine name="izumi" compiler="intel" category="unit_tests"/>
4166+
</machines>
4167+
<options>
4168+
<option name="wallclock">00:30:00</option>
4169+
<option name="comment">This test runs FATES's Fortran functional tests. We're abusing the system test infrastructure to run these, so that a run of the test suite results in the unit tests being run as well. Grid and compset are irrelevant here, except that compset must be one that includes CTSM in order for CIME to find the test definition.</option>
41554170
</options>
41564171
</test>
41574172

0 commit comments

Comments
 (0)