Skip to content

Commit 4bba736

Browse files
committed
Merge tag 'ctsm5.3.046' into b4b-dev-merge-20250524
For FATES set itype to ispval and a few unused variables to nan On FATES patches, there should be no notion of pft associated with the patch, and therefore patch%itype should always be invalid. Even for FATES-SP, the patch should be associated with the FATES pft, which is not associated with itype. In this set of changes, itype is set to spval on fates patches. This will help prevent bugs in the future, because its use in a fates context should trigger errors, particularly in debug mode. When FATES with itype tset o ispval which when used in DEBUG mode will show up as a bounds overflow. For example in issue 2932, where the use of Meier 2022 was turned on in FATES and shouldn't have been. For FATES also set the fields downreg, leafn, froot, and croot t NaN, so when used in DEBUG mode their use will result in a floting point exception.
2 parents bb576a9 + b8f021c commit 4bba736

File tree

2 files changed

+96
-0
lines changed

2 files changed

+96
-0
lines changed

doc/ChangeLog

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,99 @@
11
===============================================================
2+
Tag name: ctsm5.3.046
3+
Originator(s): rgknox (Ryan Knox)
4+
Date: Mon 26 May 2025 02:45:52 AM MDT
5+
One-line Summary: For FATES set itype to ispval and a few unused variables to nan to help prevent future problems
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
11+
On FATES patches, there should be no notion of pft associated with the patch, and therefore patch%itype should always be invalid.
12+
Even for FATES-SP, the patch should be associated with the FATES pft, which is not associated with itype. In this set of changes,
13+
itype is set to spval on fates patches. This will help prevent bugs in the future, because its use in a fates context should trigger
14+
errors, particularly in debug mode.
15+
16+
When FATES with itype tset o ispval which when used in DEBUG mode will show up as a bounds overflow.
17+
For example in issue 2932, where the use of Meier 2022 was turned on in FATES and shouldn't have been.
18+
19+
For FATES also set the fields downreg, leafn, froot, and croot t NaN, so when used in DEBUG mode their use will result in a floting
20+
point exception.
21+
22+
23+
Significant changes to scientifically-supported configurations
24+
--------------------------------------------------------------
25+
26+
Does this tag change answers significantly for any of the following physics configurations?
27+
(Details of any changes will be given in the "Answer changes" section below.)
28+
29+
[Put an [X] in the box for any configuration with significant answer changes.]
30+
31+
[ ] clm6_0
32+
33+
[ ] clm5_0
34+
35+
[ ] ctsm5_0-nwp
36+
37+
[ ] clm4_5
38+
39+
40+
Bugs fixed
41+
----------
42+
43+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
44+
Fixed #2933 -- setting patch%itype to invalid for FATES patches
45+
46+
Notes of particular relevance for users
47+
---------------------------------------
48+
49+
Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
50+
Dissallow drydep or MEGAN for all FATES types including FatesSp and die with
51+
a fatal_error, rather than a warning
52+
53+
Notes of particular relevance for developers:
54+
---------------------------------------------
55+
56+
Caveats for developers (e.g., code that is duplicated that requires double maintenance):
57+
Unfrtunately setting itype doesn't fix all possible problems with
58+
See discussin #2149
59+
60+
Changes to tests or testing:
61+
Disable FatesSp drydep and MEGAN tests
62+
63+
Testing summary: regular fates
64+
----------------
65+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
66+
67+
build-namelist tests (if CLMBuildNamelist.pm has changed):
68+
69+
derecho - OK
70+
71+
python testing (if python code has changed; see instructions in python/README.md; document testing done):
72+
73+
derecho - PASS
74+
75+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
76+
77+
derecho ----- OK
78+
izumi ------- OK
79+
80+
If the tag used for baseline comparisons was NOT the previous tag, note that here:
81+
82+
83+
Answer changes
84+
--------------
85+
86+
Changes answers relative to baseline: No bit-fr-bit
87+
88+
Other details
89+
-------------
90+
91+
Pull Requests that document the changes (include PR ids):
92+
(https://github.com/ESCOMP/ctsm/pull)
93+
https://github.com/ESCOMP/CTSM/pull/2935
94+
95+
===============================================================
96+
===============================================================
297
Tag name: ctsm5.3.045
398
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
499
Date: Tue May 20 11:56:15 MDT 2025

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.3.046 rgknox 05/26/2025 For FATES set itype to ispval and a few unused variables to nan to help prevent future problems
34
ctsm5.3.045 glemieux 05/20/2025 FATES default parameter update for API 40
45
ctsm5.3.044 slevis 05/14/2025 Introduce time-evolving LEAFCN_TARGET as function of leafcn param
56
ctsm5.3.043 slevis 05/09/2025 Merge b4b-dev

0 commit comments

Comments
 (0)