Skip to content

Commit b8e71e5

Browse files
samsrabinsamsrabin
committed
Merge tag 'ctsm5.3.020' into merge-master-20250116
Merge b4b-dev
2 parents 0ec2493 + a4aa4ec commit b8e71e5

File tree

21 files changed

+601
-342
lines changed

21 files changed

+601
-342
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ d866510188d26d51bcd6d37239283db690af7e82
2727
e096358c832ab292ddfd22dd5878826c7c788968
2828
475831f0fb0e31e97f630eac4e078c886558b61c
2929
fd5f177131d63d39e79a13918390bdfb642d781e
30+
a51816e0de380300b69db9fc3e2c7fa83b267b64
3031
# Ran SystemTests and python/ctsm through black python formatter
3132
5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
3233
8056ae649c1b37f5e10aaaac79005d6e3a8b2380

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
4444
[submodule "rtm"]
4545
path = components/rtm
4646
url = https://github.com/ESCOMP/RTM
47-
fxtag = rtm1_0_80
47+
fxtag = rtm1_0_86
4848
fxrequired = ToplevelRequired
4949
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5050
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
5151

5252
[submodule "mosart"]
5353
path = components/mosart
5454
url = https://github.com/ESCOMP/MOSART
55-
fxtag = mosart1.1.02
55+
fxtag = mosart1.1.07
5656
fxrequired = ToplevelRequired
5757
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5858
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,7 @@
126126
<issue>#2310</issue>
127127
</phase>
128128
</test>
129-
130-
<test name="ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly">
131-
<phase name="RUN">
132-
<status>FAIL</status>
133-
<issue>#2914</issue>
134-
</phase>
135-
</test>
136-
137-
<test name="ERS_P128x1_Ld765.f10_f10_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdNoComp">
138-
<phase name="RUN">
139-
<status>FAIL</status>
140-
<issue>#2914</issue>
141-
</phase>
142-
</test>
143-
144-
<test name="LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.derecho_intel.clm-lilac">
145-
<phase name="MODEL_BUILD">
146-
<status>FAIL</status>
147-
<issue>#2905</issue>
148-
</phase>
149-
</test>
150-
129+
151130
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
152131
<phase name="SHAREDLIB_BUILD">
153132
<status>FAIL</status>
@@ -242,23 +221,12 @@
242221
</test>
243222

244223
<test name="ERS_D_Ld20.f45_f45_mg37.I2000Clm50FatesRs.izumi_nag.clm-FatesColdTwoStream">
245-
<phase name="CREATE_NEWCASE">
246-
<status>FAIL</status>
247-
<issue>#2454</issue>
248-
</phase>
249224
<phase name="COMPARE_base_rest">
250225
<status>FAIL</status>
251226
<issue>#2325</issue>
252227
</phase>
253228
</test>
254229

255-
<test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesColdHydro">
256-
<phase name="CREATE_NEWCASE">
257-
<status>FAIL</status>
258-
<issue>#2454</issue>
259-
</phase>
260-
</test>
261-
262230
<test name="ERS_Ld60.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdST3">
263231
<phase name="RUN">
264232
<status>FAIL</status>

‎components/mosart‎

‎components/rtm‎

‎doc/ChangeLog‎

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,269 @@
11
===============================================================
2+
Tag name: ctsm5.3.020
3+
Originator(s): samrabin (Sam Rabin, UCAR/TSS, [email protected])
4+
Date: Fri Jan 17 12:21:24 MST 2025
5+
One-line Summary: Merge b4b-dev
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
Merging b4b-dev and ctsm5.3.019. Includes some improvements to test list / expected failures.
11+
12+
13+
Significant changes to scientifically-supported configurations
14+
--------------------------------------------------------------
15+
16+
Does this tag change answers significantly for any of the following physics configurations?
17+
(Details of any changes will be given in the "Answer changes" section below.)
18+
19+
[Put an [X] in the box for any configuration with significant answer changes.]
20+
21+
[ ] clm6_0
22+
23+
[ ] clm5_0
24+
25+
[ ] ctsm5_0-nwp
26+
27+
[ ] clm4_5
28+
29+
30+
Notes of particular relevance for developers:
31+
---------------------------------------------
32+
33+
Changes to tests or testing:
34+
- New test suite: Useful for redoing tests that failed due to https://github.com/ESCOMP/CTSM/issues/2916, after having replaced libraries/mpi-serial with a fresh copy.
35+
36+
37+
Testing summary:
38+
----------------
39+
40+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
41+
42+
derecho ----- OK
43+
izumi ------- OK
44+
45+
46+
Other details
47+
-------------
48+
[Remove any lines that don't apply. Remove entire section if nothing applies.]
49+
50+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
51+
52+
Pull Requests that document the changes (include PR ids):
53+
- ESCOMP/CTSM#2938: ctsm5.3.020: Merge b4b-dev 2025-01-16 (https://github.com/ESCOMP/CTSM/pull/2938)
54+
55+
===============================================================
56+
===============================================================
57+
Tag name: ctsm5.3.019
58+
Originator(s): olyson (Keith Oleson, UCAR/TSS)
59+
Date: Tue 14 Jan 2025 02:46:11 PM MST
60+
One-line Summary: Stop running 0th time step
61+
62+
Purpose and description of changes
63+
----------------------------------
64+
As with the last tag, this is also for consistency with CAM.
65+
66+
Contributors
67+
------------
68+
Bill Sacks. In the final steps, also slevis.
69+
70+
Significant changes to scientifically-supported configurations
71+
--------------------------------------------------------------
72+
73+
Does this tag change answers significantly for any of the following physics configurations?
74+
(Details of any changes will be given in the "Answer changes" section below.)
75+
76+
[Put an [X] in the box for any configuration with significant answer changes.]
77+
78+
[ ] clm6_0
79+
80+
[ ] clm5_0
81+
82+
[ ] ctsm5_0-nwp
83+
84+
[ ] clm4_5
85+
86+
87+
Bugs fixed
88+
----------
89+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
90+
Fixes #925
91+
92+
Notes of particular relevance for developers:
93+
---------------------------------------------
94+
Caveats for developers (e.g., code that is duplicated that requires double maintenance):
95+
Same or similar changes needed separately in clm, in mosart, and in rtm.
96+
97+
Changes to tests or testing:
98+
FAIL RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput RUN
99+
I did not label this failure EXPECTED because the fix is planned for the next tag, ctsm5.3.020.
100+
101+
I resolved the izumi nag tests that failed to build (due to a bug in rtm and mosart) by introducing the bug-fix manually, as explained here:
102+
https://github.com/ESCOMP/CTSM/pull/2084#issuecomment-2584164690
103+
In ctsm5.3.020 we plan to update to the rtm/mosart tags that include the fix.
104+
105+
Testing summary:
106+
----------------
107+
108+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
109+
110+
build-namelist tests (if CLMBuildNamelist.pm has changed):
111+
112+
derecho - PASS
113+
114+
python testing (if python code has changed; see instructions in python/README.md; document testing done):
115+
116+
derecho - PASS
117+
118+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
119+
120+
derecho ----- OK
121+
izumi ------- OK
122+
123+
mosart
124+
derecho ----- OK
125+
izumi ------- OK
126+
127+
rtm
128+
derecho ----- OK
129+
130+
If the tag used for baseline comparisons was NOT the previous tag, note that here:
131+
I repeated the rtm & mosart test-suites with mosart1.1.04 instead of 06 and rtm1_0_82 instead of 84 (all else the same) and compared against the new baselines mosart1.1.06-ctsm5.3.019 and rtm1_0_84-ctsm5.3.019. These gave b4b identical answers.
132+
133+
Answer changes
134+
--------------
135+
136+
Changes answers relative to baseline: Yes
137+
138+
Summarize any changes to answers, i.e.,
139+
- what code configurations: All
140+
- what platforms/compilers: All
141+
- nature of change: larger than roundoff/same climate
142+
143+
Caveat: We see diffs in mosart and cpl output that will be eliminated in ctsm5.3.020. They are discussed here:
144+
https://github.com/ESCOMP/CTSM/pull/2838#issuecomment-2477608383
145+
https://github.com/ESCOMP/MOSART/issues/103#issuecomment-2479679014
146+
147+
Other details
148+
-------------
149+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
150+
rtm and mosart were already updated in the previous tag (ctsm5.3.018) to include the corresponding rtm and mosart tags
151+
152+
Pull Requests that document the changes (include PR ids):
153+
https://github.com/ESCOMP/ctsm/pull/2084
154+
https://github.com/ESCOMP/MOSART/pull/67
155+
https://github.com/ESCOMP/RTM/pull/37
156+
157+
===============================================================
158+
===============================================================
159+
Tag name: ctsm5.3.018
160+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
161+
Date: Fri 10 Jan 2025 05:37:08 PM MST
162+
One-line Summary: Change history time to be the middle of the time bounds
163+
164+
Purpose and description of changes
165+
----------------------------------
166+
Making the change to be consistent with CAM and to make history output more intuitive.
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_1
179+
180+
[ ] clm5_0
181+
182+
[ ] ctsm5_0-nwp
183+
184+
[ ] clm4_5
185+
186+
187+
Bugs fixed
188+
----------
189+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
190+
Partly addresses issue #1059
191+
192+
Notes of particular relevance for users
193+
---------------------------------------
194+
Caveats for users (e.g., need to interpolate initial conditions):
195+
The history time variable now equals the middle of the time bounds.
196+
Instantaneous history tapes now do not include time bounds.
197+
Mixed history tapes do not change the treatment of instantaneous fields or move them to separate tapes, yet.
198+
199+
Notes of particular relevance for developers:
200+
---------------------------------------------
201+
Caveats for developers (e.g., code that is duplicated that requires double maintenance):
202+
Same changes are needed separately in clm, in mosart, and in rtm.
203+
204+
Changes to tests or testing:
205+
This tag introduces changes to the mosart/rtm testlists.
206+
207+
FAIL RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput RUN
208+
I did not label this failure EXPECTED because the fix comes in later in this series of "history" tags, in particular ctsm5.3.020.
209+
210+
I resolved the izumi nag tests that failed to build (due to a bug in rtm and mosart) by introducing the bug-fix manually, as explained here:
211+
https://github.com/ESCOMP/CTSM/pull/2084#issuecomment-2584164690
212+
In the next tag we expect to update to the rtm/mosart tags that include the fix.
213+
214+
Testing summary:
215+
----------------
216+
217+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
218+
219+
build-namelist tests
220+
221+
derecho - PASS
222+
223+
python testing (if python code has changed; see instructions in python/README.md; document testing done):
224+
225+
derecho - PASS
226+
227+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
228+
229+
derecho ----- OK
230+
izumi ------- OK
231+
232+
mosart
233+
derecho ----- OK
234+
izumi ------- OK
235+
236+
rtm
237+
derecho ----- OK
238+
239+
Answer changes
240+
--------------
241+
242+
Changes answers relative to baseline: Only time variable, plus read caveat
243+
244+
Summarize any changes to answers, i.e.,
245+
- what code configurations: all
246+
- what platforms/compilers: all
247+
- nature of change: only the time variable
248+
249+
Caveat: We see diffs in mosart and cpl output that will be eliminated later in this series of "history" tags, in particular ctsm5.3.020. They are discussed here:
250+
https://github.com/ESCOMP/CTSM/pull/2838#issuecomment-2477608383
251+
https://github.com/ESCOMP/MOSART/issues/103#issuecomment-2479679014
252+
253+
Other details
254+
-------------
255+
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
256+
rtm, mosart (see related note in ctsm5.3.019)
257+
258+
Pull Requests that document the changes (include PR ids):
259+
https://github.com/ESCOMP/ctsm/pull/2838
260+
https://github.com/ESCOMP/MOSART/pull/70
261+
https://github.com/ESCOMP/RTM/issues/54
262+
https://github.com/ESCOMP/MOSART/pull/106
263+
https://github.com/ESCOMP/RTM/pull/39
264+
265+
===============================================================
266+
===============================================================
2267
Tag name: ctsm5.3.017
3268
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4269
Date: Thu 09 Jan 2025 11:56:43 AM MST

‎doc/ChangeSum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.3.020 samrabin 01/17/2025 Merge b4b-dev
4+
ctsm5.3.019 olyson 01/14/2025 Stop running 0th time step
5+
ctsm5.3.018 slevis 01/10/2025 Change history time to be the middle of the time bounds
36
ctsm5.3.017 slevis 01/09/2025 Merge tmp-241219 branch to master
47
tmp-241219.n03.ctsm5.3.016 01/09/2025 Bug fix for izumi nag tests to pass (slevis)
58
tmp-241219.n02.ctsm5.3.016 01/08/2025 FATES hydro test update (glemieux)

0 commit comments

Comments
 (0)