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.

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

Update FATES hydro test mod to remove temporary test failure workaround #2882

Merged
merged 11 commits into from
Jan 8, 2025
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[submodule "fates"]
path = src/fates
url = https://github.com/NGEET/fates
fxtag = sci.1.79.3_api.37.0.0
fxtag = sci.1.80.4_api.37.0.0
fxrequired = AlwaysRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/fates-release
Expand Down
7 changes: 7 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,13 @@
</phase>
</test>

<test name="PVT_Lm3.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesLUPFT">
<phase name="RUN">
<status>FAIL</status>
<issue>#2919</issue>
</phase>
</test>

<!-- Other submodule test list failures (MOSART, RTM, etc. -->

<test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ hist_mfilt = 365
hist_nhtfrq = -24
hist_empty_htapes = .true.
use_fates_planthydro= .true.
fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc'
hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF',
'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF',
'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',
Expand Down
77 changes: 76 additions & 1 deletion doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,80 @@
===============================================================
Tag name: ctsm5.3.017
Tag name: tmp-241219.n02.ctsm5.3.016
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
Date: Wed 08 Jan 2025 10:52:49 AM MST
One-line Summary: FATES hydro test update

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

This minor update reverts a temporary work around for FATES hydro system tests.
The FATES tag is updated to capture the FATES-side fix to the issue that predicated
the temporary testing workaround.

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.]

[ ] clm6_0

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:

#2878 - Remove fates_allom_smode shell_command update in FatesColdHydro testmod

Notes of particular relevance for developers:
---------------------------------------------
Changes to tests or testing:
FATES hydro tests will no long build a custom parameter file on the fly
The one FATES PVT test has been added to expected failure per #2919

Testing summary: regular + fates
----------------
[PASS means all tests PASS; OK means tests PASS other than expected fails.]

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

derecho ----- OK
izumi ------- OK (see #2924)

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


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

Changes answers relative to baseline: Yes, but only for aux_clm fates testmods

The FATES tag update includes a number of science and bug fix updates since the
last fates tag update, which results in non-B4B changes. These have been reviewed
and differ as expected.

Other details
-------------
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
fates: sci.1.79.3_api.37.0.0 -> sci.1.80.4_api.37.0.0

Pull Requests that document the changes (include PR ids):
(https://github.com/ESCOMP/ctsm/pull)
https://github.com/ESCOMP/CTSM/pull/2882

===============================================================
===============================================================
Tag name: tmp-241219.n01.ctsm5.3.016
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Tue 24 Dec 2024 03:43:01 PM MST
One-line Summary: Merge b4b-dev
Expand Down
3 changes: 2 additions & 1 deletion doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.3.017 slevis 12/24/2024 Merge b4b-dev
tmp-241219.n02.ctsm5.3.016 01/08/2025 FATES hydro test update
tmp-241219.n01.ctsm5.3.016 12/24/2024 Merge b4b-dev
ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename
ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes
ctsm5.3.014 erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags
Expand Down
Loading