Skip to content

Commit 7b88335

Browse files
ekluzekekluzek
committed
Merge remote-tracking branch 'escomp/b4b-dev' into cesm3_0_beta05_submodules
2 parents 1224d97 + 9c4d3dc commit 7b88335

File tree

10 files changed

+255
-13
lines changed

10 files changed

+255
-13
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/NGEET/fates
31-
fxtag = sci.1.79.3_api.37.0.0
31+
fxtag = sci.1.80.4_api.37.0.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/NCAR/fates-release

‎cime_config/testdefs/ExpectedTestFails.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
</test>
115115

116116
<test name="SMS_D.f10_f10_mg37.I2000Clm60BgcCrop.derecho_nvhpc.clm-crop">
117-
<phase name="BUILD">
117+
<phase name="SHAREDLIB_BUILD">
118118
<status>FAIL</status>
119119
<issue>#1733</issue>
120120
</phase>
@@ -556,6 +556,13 @@
556556
</phase>
557557
</test>
558558

559+
<test name="PVT_Lm3.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesLUPFT">
560+
<phase name="RUN">
561+
<status>FAIL</status>
562+
<issue>#2919</issue>
563+
</phase>
564+
</test>
565+
559566
<!-- Other submodule test list failures (MOSART, RTM, etc. -->
560567

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

‎cime_config/testdefs/testlist_clm.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,15 @@
13171317
<option name="comment" >Science support for I1850Clm50BgcCropCru at f19</option>
13181318
</options>
13191319
</test>
1320+
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN_BNF">
1321+
<machines>
1322+
<machine name="derecho" compiler="intel" category="aux_clm"/>
1323+
<machine name="izumi" compiler="nag" category="aux_clm"/>
1324+
</machines>
1325+
<options>
1326+
<option name="wallclock">00:20:00</option>
1327+
</options>
1328+
</test>
13201329
<test name="ERP_D_Ld5_P48x1" grid="f10_f10_mg37" compset="I2000Clm50BgcCru" testmods="clm/flexCN_FUN">
13211330
<machines>
13221331
<machine name="izumi" compiler="nag" category="aux_clm"/>

‎cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ hist_mfilt = 365
22
hist_nhtfrq = -24
33
hist_empty_htapes = .true.
44
use_fates_planthydro= .true.
5-
fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc'
65
hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF',
76
'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF',
87
'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',

‎cime_config/testdefs/testmods_dirs/clm/flexCN_FUN_BNF/include_user_mods

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../flexCN_FUN

‎cime_config/testdefs/testmods_dirs/clm/flexCN_FUN_BNF/user_nl_clm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nfix_method = 'Bytnerowicz'
2+

‎doc/ChangeLog

Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,235 @@
11
===============================================================
22
Tag name: ctsm5.3.017
33
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4+
Date: Thu 09 Jan 2025 11:56:43 AM MST
5+
One-line Summary: Merge tmp-241219 branch to master
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
Includes three tmp-241219 tags:
11+
tmp-241219.n01.ctsm5.3.016 Merge b4b-dev:
12+
nfix_method options Houlton (default), Bytnerowicz (option)
13+
tmp-241219.n02.ctsm5.3.016 FATES hydro test update
14+
tmp-241219.n03.ctsm5.3.016 Bug fix for izumi nag tests to pass (b4b unless using Bytnerowicz)
15+
16+
Significant changes to scientifically-supported configurations
17+
--------------------------------------------------------------
18+
19+
Does this tag change answers significantly for any of the following physics configurations?
20+
(Details of any changes will be given in the "Answer changes" section below.)
21+
22+
[Put an [X] in the box for any configuration with significant answer changes.]
23+
24+
[ ] clm6_0
25+
26+
[ ] clm5_0
27+
28+
[ ] ctsm5_0-nwp
29+
30+
[ ] clm4_5
31+
32+
33+
Bugs fixed
34+
----------
35+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
36+
Each separate tag documents this information below.
37+
38+
Notes of particular relevance for users
39+
---------------------------------------
40+
Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
41+
nfix_method as explained in tmp-241219.n01.ctsm5.3.016 tag below.
42+
43+
Notes of particular relevance for developers:
44+
---------------------------------------------
45+
Changes to tests or testing:
46+
New tests as documented in tmp-241219.n03.ctsm5.3.016 tag below.
47+
48+
Testing summary:
49+
----------------
50+
51+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
52+
53+
derecho ----- OK (baseline linked to tmp-241219.n03.ctsm5.3.016)
54+
izumi ------- OK (baseline linked to tmp-241219.n03.ctsm5.3.016)
55+
56+
fates tests:
57+
derecho ----- No new testing; last baseline is fates-sci.1.80.4_api.37.0.0-tmp-241219.n02.ctsm5.3.016
58+
izumi ------- No new testing; see tmp-241219.n02.ctsm5.3.016 tag below
59+
60+
Answer changes
61+
--------------
62+
63+
Changes answers relative to baseline: Yes, only for aux_clm fates testmods
64+
65+
Same comment as in tmp-241219.n02.ctsm5.3.016 tag:
66+
The FATES tag update includes a number of science and bug fix updates since the
67+
last fates tag update, which results in non-B4B changes. These have been reviewed
68+
and differ as expected.
69+
70+
Also, see caveat in Answer changes for tag tmp-241219.n01.ctsm5.3.016.
71+
72+
Other details
73+
-------------
74+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
75+
fates updated to sci.1.80.4_api.37.0.0
76+
77+
Pull Requests that document the changes (include PR ids):
78+
https://github.com/ESCOMP/ctsm/pull/2928
79+
80+
===============================================================
81+
===============================================================
82+
Tag name: tmp-241219.n03.ctsm5.3.016
83+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
84+
Date: Thu 09 Jan 2025 11:39:37 AM MST
85+
One-line Summary: Bug fix for izumi nag tests to pass
86+
87+
Purpose and description of changes
88+
----------------------------------
89+
Allocation statements should have been (0:mxpft) instead of (mxpft).
90+
I introduced the bug in a small refactor requested in #2917.
91+
92+
Significant changes to scientifically-supported configurations
93+
--------------------------------------------------------------
94+
95+
Does this tag change answers significantly for any of the following physics configurations?
96+
(Details of any changes will be given in the "Answer changes" section below.)
97+
98+
[Put an [X] in the box for any configuration with significant answer changes.]
99+
100+
[ ] clm6_0
101+
102+
[ ] clm5_0
103+
104+
[ ] ctsm5_0-nwp
105+
106+
[ ] clm4_5
107+
108+
109+
Bugs fixed
110+
----------
111+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
112+
Fixes #2924
113+
114+
Notes of particular relevance for developers:
115+
---------------------------------------------
116+
Changes to tests or testing:
117+
Added tests that I should have added in the tmp-241219.n01.ctsm5.3.016 tag:
118+
ERP_D_Ld5_P48x1.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-flexCN_FUN_BNF
119+
ERP_D_Ld5_P48x1.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-flexCN_FUN_BNF
120+
121+
Testing summary:
122+
----------------
123+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
124+
125+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
126+
127+
derecho ----- OK
128+
izumi ------- OK
129+
130+
If the tag used for baseline comparisons was NOT the previous tag, note that here:
131+
derecho used tmp-241219.n02.ctsm5.3.016 (i.e. the previous tag)
132+
izumi used ctsm5.3.016 because it was the best available baseline
133+
134+
Answer changes
135+
--------------
136+
137+
Changes answers relative to baseline: No but read caveat.
138+
139+
Summarize any changes to answers, i.e.,
140+
- what code configurations: a few Fates cases
141+
- what platforms/compilers: izumi; only because I compared to ctsm5.3.016
142+
- nature of change: same as in the tmp-241219.n02.ctsm5.3.016 tag
143+
144+
Note: Also on izumi I see the following failure in all the tests that 'failed to initialize'
145+
that I had to go back to build and run, whether with ./case.build or ./create_test. For example:
146+
FAIL ERP_D_Ld5_P48x1.f10_f10_mg37.I2000Clm50BgcCru.izumi_nag.clm-noFUN_flexCN BASELINE ctsm5.3.016: ERROR CPRNC failed to open files
147+
I am aware that others have also seen this behavior.
148+
149+
Other details
150+
-------------
151+
Pull Requests that document the changes (include PR ids):
152+
https://github.com/ESCOMP/ctsm/pull/2925
153+
154+
===============================================================
155+
===============================================================
156+
Tag name: tmp-241219.n02.ctsm5.3.016
157+
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
158+
Date: Wed 08 Jan 2025 10:52:49 AM MST
159+
One-line Summary: FATES hydro test update
160+
161+
Purpose and description of changes
162+
----------------------------------
163+
164+
This minor update reverts a temporary work around for FATES hydro system tests.
165+
The FATES tag is updated to capture the FATES-side fix to the issue that predicated
166+
the temporary testing workaround.
167+
168+
Significant changes to scientifically-supported configurations
169+
--------------------------------------------------------------
170+
171+
Does this tag change answers significantly for any of the following physics configurations?
172+
(Details of any changes will be given in the "Answer changes" section below.)
173+
174+
[Put an [X] in the box for any configuration with significant answer changes.]
175+
176+
[ ] clm6_0
177+
178+
[ ] clm5_0
179+
180+
[ ] ctsm5_0-nwp
181+
182+
[ ] clm4_5
183+
184+
185+
Bugs fixed
186+
----------
187+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
188+
189+
#2878 - Remove fates_allom_smode shell_command update in FatesColdHydro testmod
190+
191+
Notes of particular relevance for developers:
192+
---------------------------------------------
193+
Changes to tests or testing:
194+
FATES hydro tests will no long build a custom parameter file on the fly
195+
The one FATES PVT test has been added to expected failure per #2919
196+
197+
Testing summary: regular + fates
198+
----------------
199+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
200+
201+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
202+
203+
derecho ----- OK
204+
izumi ------- OK (see #2924)
205+
206+
fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
207+
derecho ----- OK
208+
izumi ------- OK
209+
210+
211+
Answer changes
212+
--------------
213+
214+
Changes answers relative to baseline: Yes, but only for aux_clm fates testmods
215+
216+
The FATES tag update includes a number of science and bug fix updates since the
217+
last fates tag update, which results in non-B4B changes. These have been reviewed
218+
and differ as expected.
219+
220+
Other details
221+
-------------
222+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
223+
fates: sci.1.79.3_api.37.0.0 -> sci.1.80.4_api.37.0.0
224+
225+
Pull Requests that document the changes (include PR ids):
226+
(https://github.com/ESCOMP/ctsm/pull)
227+
https://github.com/ESCOMP/CTSM/pull/2882
228+
229+
===============================================================
230+
===============================================================
231+
Tag name: tmp-241219.n01.ctsm5.3.016
232+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4233
Date: Tue 24 Dec 2024 03:43:01 PM MST
5234
One-line Summary: Merge b4b-dev
6235

‎doc/ChangeSum

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Tag Who Date Summary
22
============================================================================================================================
3-
ctsm5.3.017 slevis 12/24/2024 Merge b4b-dev
3+
ctsm5.3.017 slevis 01/09/2025 Merge tmp-241219 branch to master
4+
tmp-241219.n03.ctsm5.3.016 01/09/2025 Bug fix for izumi nag tests to pass (slevis)
5+
tmp-241219.n02.ctsm5.3.016 01/08/2025 FATES hydro test update (glemieux)
6+
tmp-241219.n01.ctsm5.3.016 12/24/2024 Merge b4b-dev (slevis)
47
ctsm5.3.016 erik 12/19/2024 Rpointer files for restart now have the simulation date in the filename
58
ctsm5.3.015 erik 12/18/2024 Update cdeps with cam7 nextsw cday changes
69
ctsm5.3.014 erik 12/03/2024 Bring in several fixes for testing in the previous cesm3_0_beta03/04 tags

‎src/fates

0 commit comments

Comments
 (0)