Skip to content

Commit

Permalink
Merge pull request #1849 from glemieux/fates-tests-ers-fbg_nocomp
Browse files Browse the repository at this point in the history
Add long term exact restart test and fixed biogeog + no competition tests to fates suite
  • Loading branch information
ekluzek authored Oct 15, 2022
2 parents c6d8032 + b098b6b commit 616905b
Show file tree
Hide file tree
Showing 72 changed files with 247 additions and 76 deletions.
2 changes: 1 addition & 1 deletion Externals_CLM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local_path = src/fates
protocol = git
repo_url = https://github.com/NGEET/fates
tag = sci.1.58.1_api.24.1.0
tag = sci.1.59.7_api.24.1.0
required = True

[externals_description]
Expand Down
23 changes: 22 additions & 1 deletion cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,32 @@

<!-- fates test suite failures -->

<test name="ERS_D_Lm12.1x1_brazil.I2000Clm50FatesCruGs.cheyenne_intel.clm-FatesFireLightningPopDens">
<test name="ERS_Lm12.1x1_brazil.I2000Clm50FatesCruRsGs.cheyenne_intel.clm-FatesFireLightningPopDens">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#667</issue>
</phase>
</test>

<test name="ERS_Lm13.f45_f45_mg37.I2000Clm50Fates.cheyenne_intel.clm-FatesColdNoComp">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>FATES#897</issue>
</phase>
</test>

<test name="ERS_Lm13.f10_f10_mg37.I2000Clm50Fates.cheyenne_gnu.clm-FatesCold">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>FATES#897</issue>
</phase>
</test>

<test name="ERS_D_Ld5.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdHydro">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>FATES#701</issue>
</phase>
</test>

</expectedFails>
124 changes: 74 additions & 50 deletions cime_config/testdefs/testlist_clm.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange CLM_FORCE_COLDSTART="on"
./xmlchange BFBFLAG="TRUE"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesColdBasic
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

hist_mfilt = 365
hist_nhtfrq = -24

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesColdBasic
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

hist_mfilt = 365
hist_nhtfrq = -24

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesColdNoComp
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use_fates_fixed_biogeog=.true.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesColdBasic
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

hist_mfilt = 365
hist_nhtfrq = -24

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
../FatesColdSatPhen
../prescribed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesCold
109 changes: 109 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,113 @@
===============================================================
Tag name: ctsm5.1.dev112
Originator(s): adrifoster (Adrianna Foster), glemieux (Gregory Lemieux, LBL/NGEET)
Date: Sat Oct 15 16:26:28 MDT 2022
One-line Summary: Rework fates test definitions and add new fates tests

Purpose and description of changes
----------------------------------

This tag includes a number of updates to the fates test definitions and test list to gain more coverage:

(1) Reorder and update the fates test definitions so that fates satellite phenology mode
can be configured for cases using a compset.

(2) Add a long-term exact restart test to catch issues that may arise due to updates to
fates procedure calls during end of year simulation dates.

(3) Add a no-competition + fixed biogeography, non-satellite phenology test definition to provide
additional mode combination configuration.

(4) Update the fates externals tag to incorporate a fix a vegetation temperature exact restart
issue discovered while implementing (1) above.

(5) Truncate all testmods starting with "Fates" to mitigate running over the limits on the length
of testnames, typically when specifying custom `test_id` using `run_sys_test`.

(6) Updates the expected failures list.

Significant changes to scientifically-supported configurations
--------------------------------------------------------------

Does this tag change answers significantly for any of the following physics configurations?
(Details of any changes will be given in the "Answer changes" section below.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed or introduced
------------------------

CTSM issues fixed (include CTSM Issue #):
Fixes #1839 - Add more FATES tests that are longer than one year
Fixes #1817 - Make sure at least one test running FatesSp just uses the compset and not a test-mod directory
Fixes #1551 - Add FATES NoComp + FixedBiogeog regression test to the fates category of tests

Externals issues fixed (include issue #):
FATES#908 - Bareground area_pft not being carried over during restarts
FATES#911 - 24-hr running mean vegetation temperature is not b4b on threaded exact restart SatPhen test

Notes of particular relevance for developers:
---------------------------------------------

Changes to tests or testing:
FATES#897 is still unresolved, but is now covered by this updated test list.
FATES#701 was reopened

Testing summary:
----------------

[PASS means all tests PASS; OK means tests PASS other than expected fails.]

build-namelist tests (if CLMBuildNamelist.pm has changed):

cheyenne - PASS

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

cheyenne ---- OK
izumi ------- OK

fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
cheyenne ---- OK
izumi ------- OK

any other testing (give details below):

If the tag used for baseline comparisons was NOT the previous tag, note that here:

FATES tests run against both fates-sci.1.58.1_api.24.1.0-ctsm5.1.dev111 to check the
fates update against the previous baseline is in line with expected DIFFs and
fates-sci.1.59.7_api.24.1.0-ctsm5.1.dev111.

Answer changes
--------------

Changes answers relative to baseline:
Yes, for fates run modes only due non-b4b updates in multiple fates tags. These
include both software bug fixes and answer changing science updates.

Other details
-------------

List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): fates

Pull Requests that document the changes (include PR ids):

https://github.com/ESCOMP/CTSM/pull/1827
https://github.com/ESCOMP/CTSM/pull/1849


===============================================================
===============================================================
Tag name: ctsm5.1.dev111
Originator(s): jedwards (Jim Edwards), wwieder (Will Wieder), sacks (Bill Sacks)
Date: Wed Oct 5 13:05:52 MDT 2022
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.1.dev112 multiple 10/15/2022 Rework fates test definitions and add new fates tests
ctsm5.1.dev111 multiple 10/05/2022 Fixes for NEON cases
ctsm5.1.dev110 slevis 09/26/2022 Introduction of modify_meshes tool for use in I-cases and F-cases
ctsm5.1.dev109 slevis 09/26/2022 If not MIMICS, do not output certain MIMICS history fields
Expand Down

0 comments on commit 616905b

Please sign in to comment.