Skip to content

Commit 9765ab6

Browse files
dpsarmiedpsarmie
authored
Add UFSATM documentation // update MOM6 to its main repo. 20260302 commit (#3116) // Specify # of Increased Warnings/Remarks in GHA Check (#3132) (#3123)
* UFSWM - Bring in UFSATM documentation * UFSWM - Enhancement to GHA warnings/remarks check * UFSATM - Documentation was added in doxygen format * MOM6 - update MOM6 to its main repository 20260302 updating
1 parent d602da6 commit 9765ab6

14 files changed

+2272
-2266
lines changed

‎.github/scripts/check_log_warnings_remarks.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ def call_API(self, endpoint):
3434

3535
api_call = APICall(endpoint)
3636
response = requests.get(api_call.url, headers=api_call.header)
37+
if response.status_code != 200:
38+
logging.warning(response)
39+
print(response)
40+
sys.exit(1)
3741
response = json.loads(response.text)
3842

3943
return response
@@ -96,15 +100,15 @@ def _get_pr_data(self, commit):
96100
def compare_results(self, pr_log, base_log):
97101
"""Compare warnings/remarks for PR head and base commits to determine whether warnings/remarks have increased."""
98102

99-
increases = {'warnings': [], 'remarks': []}
103+
increases = {'warnings': {}, 'remarks': {}}
100104

101105
for test in pr_log:
102106
# Check warnings
103107
if pr_log[test][0] > base_log[test][0]:
104-
increases['warnings'].append(test)
108+
increases['warnings'].update({test: pr_log[test][0] - base_log[test][0]})
105109
# Check remarks
106110
if pr_log[test][1] > base_log[test][1]:
107-
increases['remarks'].append(test)
111+
increases['remarks'].update({test: pr_log[test][1] - base_log[test][1]})
108112

109113
return increases
110114

@@ -118,7 +122,9 @@ def print_html_results(dict):
118122
for category in results.keys():
119123
if results[category]:
120124
mdFile.write(f"\n<h3>{machine.upper()}</h3>\n")
121-
unordered_list = [f"**{category.title()}:**", dict[machine][category]]
125+
unordered_list = [f"**{category.title()}:**", []]
126+
for test, value in dict[machine][category].items():
127+
unordered_list[1].append(f"{test}: {value}")
122128
mdFile.new_list(unordered_list, marked_with='*')
123129
return mdFile.get_md_text()
124130

‎MOM6-interface/MOM6‎

Submodule MOM6 updated 369 files

‎MOM6-interface/mom6_files.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ list(APPEND mom6_nuopc_src_files
336336
MOM6/config_src/drivers/nuopc_cap/mom_cap_time.F90
337337
MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
338338
MOM6/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
339-
MOM6/config_src/drivers/nuopc_cap/mom_ufs_trace_wrapper.F90
339+
MOM6/config_src/drivers/nuopc_cap/mom_cap_profiling.F90
340340
MOM6/config_src/drivers/nuopc_cap/mom_inline_mod.F90
341341
MOM6/config_src/drivers/nuopc_cap/mom_cap_outputlog.F90
342342
MOM6/config_src/drivers/unit_tests/test_MOM_ANN.F90

‎UFSATM‎

Submodule UFSATM updated 29 files

‎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-
Wed Mar 4 23:01:31 UTC 2026
1+
Mon Mar 9 18:53:40 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 137.791725
55-
0: The maximum resident set size (KB) = 2588120
54+
0: The total amount of wall time = 135.999336
55+
0: The maximum resident set size (KB) = 2593604
5656

5757
Test bit_base PASS
5858

5959

6060
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/dbg_base_dbg_base
61+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 1232.071527
110-
0: The maximum resident set size (KB) = 2550812
109+
0: The total amount of wall time = 1240.024205
110+
0: The maximum resident set size (KB) = 2526908
111111

112112
Test dbg_base PASS
113113

114114

115115
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/dcp_dcp
116+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 523.259799
164-
0: The maximum resident set size (KB) = 2515228
163+
0: The total amount of wall time = 122.770360
164+
0: The maximum resident set size (KB) = 2505984
165165

166166
Test dcp PASS
167167

168168

169169
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/mpi_mpi
170+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 112.970449
218-
0: The maximum resident set size (KB) = 2503888
217+
0: The total amount of wall time = 116.808086
218+
0: The maximum resident set size (KB) = 2507000
219219

220220
Test mpi PASS
221221

222222

223223
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/rst_rst
224+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 119.124706
272-
0: The maximum resident set size (KB) = 2503936
271+
0: The total amount of wall time = 115.108826
272+
0: The maximum resident set size (KB) = 2509156
273273

274274
Test rst PASS
275275

276276

277277
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/std_base_std_base
278+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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 = 122.939120
327-
0: The maximum resident set size (KB) = 2508276
326+
0: The total amount of wall time = 113.171843
327+
0: The maximum resident set size (KB) = 2521228
328328

329329
Test std_base PASS
330330

331331

332332
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170967/thr_thr
333+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2068788/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.428836
381-
0: The maximum resident set size (KB) = 2514812
380+
0: The total amount of wall time = 128.508869
381+
0: The maximum resident set size (KB) = 2494664
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu Mar 5 00:21:31 UTC 2026
387-
Elapsed time: 01h:20m:00s. Have a nice day!
386+
Mon Mar 9 20:02:52 UTC 2026
387+
Elapsed time: 01h:09m:12s. Have a nice day!

‎tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_ursa.log‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Wed Mar 4 23:01:31 UTC 2026
1+
Mon Mar 9 18:53:41 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/dbg_base_dbg_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069016/dbg_base_dbg_base
77
Checking test dbg_base results ....
88
Moving baseline dbg_base files ....
99
Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
6666
Moving RESTART/iced.2021-03-23-21600.nc .........OK
6767
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
6868

69-
0: The total amount of wall time = 3026.477143
70-
0: The maximum resident set size (KB) = 3024252
69+
0: The total amount of wall time = 3024.336448
70+
0: The maximum resident set size (KB) = 3046392
7171

7272
Test dbg_base PASS
7373

7474

7575
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
76-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/rst_rst
76+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069016/rst_rst
7777
Checking test rst results ....
7878
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
7979
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
135135
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
136136
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
137137

138-
0: The total amount of wall time = 284.475682
139-
0: The maximum resident set size (KB) = 3002600
138+
0: The total amount of wall time = 284.303806
139+
0: The maximum resident set size (KB) = 3008196
140140

141141
Test rst PASS
142142

143143

144144
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_intel
145-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170954/std_base_std_base
145+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069016/std_base_std_base
146146
Checking test std_base results ....
147147
Moving baseline std_base files ....
148148
Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
205205
Moving RESTART/iced.2021-03-23-21600.nc .........OK
206206
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
207207

208-
0: The total amount of wall time = 283.763951
209-
0: The maximum resident set size (KB) = 2998376
208+
0: The total amount of wall time = 283.924324
209+
0: The maximum resident set size (KB) = 2997428
210210

211211
Test std_base PASS
212212

213213
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
214-
Thu Mar 5 00:27:27 UTC 2026
215-
Elapsed time: 01h:25m:56s. Have a nice day!
214+
Mon Mar 9 20:13:49 UTC 2026
215+
Elapsed time: 01h:20m:09s. 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-
Wed Mar 4 23:01:31 UTC 2026
1+
Mon Mar 9 18:53:41 UTC 2026
22
Start Operation Requirement Test
33

44

55
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
6-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/bit_base_bit_base
6+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069042/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 = 298.295321
19-
0: The maximum resident set size (KB) = 2081192
18+
0: The total amount of wall time = 290.863931
19+
0: The maximum resident set size (KB) = 2080012
2020

2121
Test bit_base PASS
2222

2323

2424
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
25-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/dcp_dcp
25+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069042/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 = 196.588471
37-
0: The maximum resident set size (KB) = 1718536
36+
0: The total amount of wall time = 199.682059
37+
0: The maximum resident set size (KB) = 1716664
3838

3939
Test dcp PASS
4040

4141

4242
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
43-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/std_base_std_base
43+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069042/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.293571
56-
0: The maximum resident set size (KB) = 1706876
55+
0: The total amount of wall time = 198.829673
56+
0: The maximum resident set size (KB) = 1724460
5757

5858
Test std_base PASS
5959

6060

6161
baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
62-
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1170941/thr_thr
62+
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2069042/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 = 197.396008
74-
0: The maximum resident set size (KB) = 1723320
73+
0: The total amount of wall time = 197.142608
74+
0: The maximum resident set size (KB) = 1711592
7575

7676
Test thr PASS
7777

7878
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
79-
Wed Mar 4 23:43:03 UTC 2026
80-
Elapsed time: 00h:41m:32s. Have a nice day!
79+
Mon Mar 9 19:34:19 UTC 2026
80+
Elapsed time: 00h:40m:38s. Have a nice day!

0 commit comments

Comments
 (0)