Skip to content

Commit f536c50

Browse files
DeniseWorthenDeniseWorthen
authored
Merge branch 'ufs-community:develop' into feature/purgehycom
2 parents 1baa134 + 163ba47 commit f536c50

13 files changed

+2152
-2144
lines changed

‎.github/scripts/check_log_warnings_remarks.py‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,16 @@ def _get_test_data(self, log_instance):
7373

7474
tests_for_log_instance = {}
7575

76-
pattern = r"COMPILE \'(.*)\' \[\d+:\d+, \d+:\d+\] \( (\d+) warnings (\d+) remarks \)"
76+
# Use non-capturing groups in pattern to indicate warnings/remarks may or may not be present.
77+
pattern = r"COMPILE \'(.*)\' \[\d+:\d+, \d+:\d+\](?: \( (?:(\d+) warnings)?\s*(?:(\d+) remarks)? \))?"
78+
7779
log_instance = log_instance.splitlines()
7880

7981
for line in log_instance:
8082
test_match = re.search(pattern, line)
8183
if test_match:
8284
test_name, warnings, remarks = test_match.groups()
83-
tests_for_log_instance[test_name] = (int(warnings), int(remarks))
85+
tests_for_log_instance[test_name] = (warnings, remarks)
8486

8587
return tests_for_log_instance
8688

@@ -92,17 +94,29 @@ def _get_pr_data(self, commit):
9294
try:
9395
log_text = self._fetch_log_text(commit)
9496
log_data = self._get_test_data(log_text)
97+
log_data = self._clean_data(log_data)
9598
return log_data
9699
except:
97100
logging.error(f"No commit found for the ref {commit}")
98101
sys.exit(1)
99102

103+
def _clean_data(self, test_data):
104+
"""Convert None values to zeros in the test_data dictionary"""
105+
clean_data = {
106+
k: tuple(0 if v is None else int(v) for v in values)
107+
for k, values in test_data.items()
108+
}
109+
return clean_data
110+
100111
def compare_results(self, pr_log, base_log):
101112
"""Compare warnings/remarks for PR head and base commits to determine whether warnings/remarks have increased."""
102113

103114
increases = {'warnings': {}, 'remarks': {}}
104115

105116
for test in pr_log:
117+
if test not in base_log:
118+
logging.info(f"Skipped test {test}; nothing to compare against.")
119+
continue
106120
# Check warnings
107121
if pr_log[test][0] > base_log[test][0]:
108122
increases['warnings'].update({test: pr_log[test][0] - base_log[test][0]})
@@ -142,7 +156,7 @@ def main():
142156
log._get_commits()
143157
log.pr_log_data = log._get_pr_data(log.pr_head_commit)
144158
log.base_log_data = log._get_pr_data(log.pr_base_commit)
145-
159+
146160
increased_warnings_remarks[machine] = log.compare_results(log.pr_log_data, log.base_log_data)
147161

148162
results = print_html_results(increased_warnings_remarks)

‎UFSATM‎

Submodule UFSATM updated 1 file

‎tests/bl_date.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20260316
1+
export BL_DATE=20260318

‎tests/logs/OpnReqTests_control_p8_ursa.log‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Mar 17 17:59:19 UTC 2026
1+
Thu Mar 19 01:48:20 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

54-
0: The total amount of wall time = 218.002439
55-
0: The maximum resident set size (KB) = 2629488
54+
0: The total amount of wall time = 139.079709
55+
0: The maximum resident set size (KB) = 2604684
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/dbg_base_dbg_base
61+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

109-
0: The total amount of wall time = 2485.300941
110-
0: The maximum resident set size (KB) = 2538984
109+
0: The total amount of wall time = 1247.512637
110+
0: The maximum resident set size (KB) = 2537552
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/dcp_dcp
116+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

163-
0: The total amount of wall time = 603.679916
164-
0: The maximum resident set size (KB) = 2507588
163+
0: The total amount of wall time = 133.128618
164+
0: The maximum resident set size (KB) = 2514628
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/mpi_mpi
170+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

217-
0: The total amount of wall time = 619.962161
218-
0: The maximum resident set size (KB) = 2508276
217+
0: The total amount of wall time = 125.769293
218+
0: The maximum resident set size (KB) = 2491648
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/rst_rst
224+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

271-
0: The total amount of wall time = 517.415798
272-
0: The maximum resident set size (KB) = 2511964
271+
0: The total amount of wall time = 134.582995
272+
0: The maximum resident set size (KB) = 2517388
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/std_base_std_base
278+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

326-
0: The total amount of wall time = 579.211633
327-
0: The maximum resident set size (KB) = 2500832
326+
0: The total amount of wall time = 123.494067
327+
0: The maximum resident set size (KB) = 2511116
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/thr_thr
333+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

380-
0: The total amount of wall time = 336.299914
381-
0: The maximum resident set size (KB) = 2508392
380+
0: The total amount of wall time = 123.565468
381+
0: The maximum resident set size (KB) = 2511044
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Wed Mar 18 00:57:48 UTC 2026
387-
Elapsed time: 06h:58m:29s. Have a nice day!
386+
Thu Mar 19 02:55:22 UTC 2026
387+
Elapsed time: 01h:07m:02s. Have a nice day!

‎tests/logs/OpnReqTests_regional_control_ursa.log‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Tue Mar 17 18:00:19 UTC 2026
1+
Thu Mar 19 01:49:27 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving dynf000.nc .........OK
@@ -15,14 +15,14 @@ Moving baseline bit_base files ....
1515
Moving NATLEV.GrbF00 .........OK
1616
Moving NATLEV.GrbF06 .........OK
1717

18-
0: The total amount of wall time = 286.301486
19-
0: The maximum resident set size (KB) = 2066256
18+
0: The total amount of wall time = 286.000958
19+
0: The maximum resident set size (KB) = 2075548
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
25-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/dcp_dcp
2626
Checking test dcp results ....
2727
Comparing dynf000.nc .....USING NCCMP......OK
2828
Comparing dynf006.nc .....USING NCCMP......OK
@@ -33,14 +33,14 @@ Checking test dcp results ....
3333
Comparing NATLEV.GrbF00 .....USING CMP......OK
3434
Comparing NATLEV.GrbF06 .....USING CMP......OK
3535

36-
0: The total amount of wall time = 202.627120
37-
0: The maximum resident set size (KB) = 1725480
36+
0: The total amount of wall time = 202.231539
37+
0: The maximum resident set size (KB) = 1722256
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
43-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/std_base_std_base
4444
Checking test std_base results ....
4545
Moving baseline std_base files ....
4646
Moving dynf000.nc .........OK
@@ -52,14 +52,14 @@ Moving baseline std_base files ....
5252
Moving NATLEV.GrbF00 .........OK
5353
Moving NATLEV.GrbF06 .........OK
5454

55-
0: The total amount of wall time = 197.849750
56-
0: The maximum resident set size (KB) = 1710928
55+
0: The total amount of wall time = 199.484150
56+
0: The maximum resident set size (KB) = 1707736
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
62-
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/thr_thr
6363
Checking test thr results ....
6464
Comparing dynf000.nc .....USING NCCMP......OK
6565
Comparing dynf006.nc .....USING NCCMP......OK
@@ -70,11 +70,11 @@ Checking test thr results ....
7070
Comparing NATLEV.GrbF00 .....USING CMP......OK
7171
Comparing NATLEV.GrbF06 .....USING CMP......OK
7272

73-
0: The total amount of wall time = 199.663179
74-
0: The maximum resident set size (KB) = 1714952
73+
0: The total amount of wall time = 217.188252
74+
0: The maximum resident set size (KB) = 1723576
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Wed Mar 18 04:44:01 UTC 2026
80-
Elapsed time: 10h:43m:42s. Have a nice day!
79+
Thu Mar 19 02:25:42 UTC 2026
80+
Elapsed time: 00h:36m:15s. Have a nice day!

0 commit comments

Comments
 (0)