Skip to content

Commit 1fc4af4

Browse files
authored
Merge pull request #3926 from glemieux/fates-luh-isnan-fix
ctsm5.4.033: Update FATES tag with fix for LUH `no_nan` data set issue
2 parents 6256957 + 788ad05 commit 1fc4af4

5 files changed

Lines changed: 66 additions & 23 deletions

File tree

.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/NGEET/fates
31-
fxtag = sci.1.92.0_api.44.0.0
31+
fxtag = sci.1.92.1_api.44.1.0
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/testdefs/ExpectedTestFails.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,6 @@
261261
</phase>
262262
</test>
263263

264-
<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2">
265-
<phase name="RUN">
266-
<status>FAIL</status>
267-
<issue>#3789</issue>
268-
</phase>
269-
</test>
270-
271264
<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdLUH2">
272265
<phase name="RUN">
273266
<status>FAIL</status>
@@ -282,20 +275,6 @@
282275
</phase>
283276
</test>
284277

285-
<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2HarvestArea">
286-
<phase name="RUN">
287-
<status>FAIL</status>
288-
<issue>#3789</issue>
289-
</phase>
290-
</test>
291-
292-
<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2HarvestMass">
293-
<phase name="RUN">
294-
<status>FAIL</status>
295-
<issue>#3789</issue>
296-
</phase>
297-
</test>
298-
299278
<!-- Other submodule test list failures (MOSART, RTM, etc. -->
300279

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

doc/ChangeLog

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,67 @@
11
===============================================================
2+
Tag name: ctsm5.4.033
3+
Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
4+
Date: Fri Apr 17 10:39:02 AM MDT 2026
5+
One-line Summary: Update fates tag with missing land use data check fix
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
This update brings in fates-side changes which allow for checking of
11+
fates land use data that uses either NaN or non-nan fill values. This
12+
also updates the fates land use data tool tag which captures the
13+
associated netcdf write encoding changes to ensure that the land use
14+
data will use non-nan values consistent with the latest default datasets.
15+
16+
17+
Bugs fixed
18+
----------
19+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
20+
Resolves #3789
21+
22+
Notes of particular relevance for developers:
23+
---------------------------------------------
24+
NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide
25+
26+
Changes to tests or testing:
27+
- Removes the FatesColdLUH testmods from the expected failures list
28+
29+
Contributors:
30+
31+
Testing summary:
32+
----------------
33+
34+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
35+
36+
derecho ----- OK
37+
izumi ------- OK
38+
39+
fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
40+
derecho ----- OK
41+
izumi ------- OK
42+
43+
44+
Answer changes
45+
--------------
46+
47+
Changes answers relative to baseline: B4B, except for FATES
48+
49+
Other details
50+
-------------
51+
52+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
53+
fates: sci.1.92.0_api.44.0.0 --> sci.1.92.1_api.44.1.0
54+
fates/tools/landusedata: v0.1.1 --> v0.4.1
55+
56+
Pull Requests that document the changes (include PR ids):
57+
(https://github.com/ESCOMP/ctsm/pull)
58+
59+
https://github.com/ESCOMP/CTSM/pull/3926
60+
https://github.com/NGEET/fates/pull/1555
61+
https://github.com/NGEET/tools-fates-landusedata/pull/41
62+
63+
===============================================================
64+
===============================================================
265
Tag name: ctsm5.4.032
366
Originator(s): samrabin (Sam Rabin, UCAR/TSS)
467
Date: Fri Apr 10 11:19:34 MDT 2026

doc/ChangeSum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.4.033 glemieux 04/17/2026 Update fates tag with missing land use data check fix
34
ctsm5.4.032 samrabin 04/10/2026 Simplify doc build messaging.
45
ctsm5.4.031 samrabin 04/09/2026 b4b-dev merge 2026-04-09
56
ctsm5.4.030 glemieux 04/03/2026 Add FATES namelist option for land use transition logic

0 commit comments

Comments
 (0)