Skip to content

Update ufsatm hash for ccpp-physics update // Bugfix for GHA warnings/remarks check (#3149) #3114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gspetro-NOAA merged 23 commits into from
Mar 20, 2026
Merged

Update ufsatm hash for ccpp-physics update // Bugfix for GHA warnings/remarks check (#3149) #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a960e6c
Update ufsatm hash.
ClaraDraper-NOAA Mar 3, 2026
9ee0aca
Update hashes.
ClaraDraper-NOAA Mar 10, 2026
5569b9b
Update hash.
ClaraDraper-NOAA Mar 10, 2026
c8b77a4
Merge branch 'develop' into fix/stc_check
ClaraDraper-NOAA Mar 10, 2026
382a41d
Update MOM6 to develop.
ClaraDraper-NOAA Mar 11, 2026
fd3a262
Merge branch 'develop' into fix/stc_check
ClaraDraper-NOAA Mar 11, 2026
117b4e2
upload RSK's ursa RT logs & test_changes.list
gspetro-NOAA Mar 16, 2026
e62f3ee
skip new tests; update regex for cases w/o both warnings & remarks; c…
gspetro-NOAA Mar 17, 2026
ca92797
Update UFS_ATM and fire_behaviour hash with latest dev.
ClaraDraper-NOAA Mar 17, 2026
38eef46
Merge branch 'develop' into fix/stc_check
ClaraDraper-NOAA Mar 17, 2026
805688b
minor comment/error msg fixes
gspetro-NOAA Mar 17, 2026
ca2a61a
Merge branch 'develop' into fix/stc_check
gspetro-NOAA Mar 18, 2026
eba9001
Merge branch 'ufs-community:develop' into gha-log-check2
gspetro-NOAA Mar 18, 2026
0d053fb
Merge branch 'gha-log-check2' of https://github.com/gspetro-NOAA/ufs-…
gspetro-NOAA Mar 18, 2026
591b69c
update bl_date.conf
gspetro-NOAA Mar 18, 2026
e96faac
derecho rt log - passed
gspetro-NOAA Mar 19, 2026
30435b7
hercules rt log - passed
gspetro-NOAA Mar 19, 2026
a6780d5
orion rt log - passed
gspetro-NOAA Mar 19, 2026
4664b6b
add ursa RT and ORT logs passed
FernandoAndrade-NOAA Mar 19, 2026
c094cf1
add gaeaC6 RT log passed
FernandoAndrade-NOAA Mar 19, 2026
05cc64a
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Mar 19, 2026
b2cdb4c
Acorn RT Log: Passed
BrianCurtis-NOAA Mar 19, 2026
b485c9d
revert gitmodules and resync ufsatm
FernandoAndrade-NOAA Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions .github/scripts/check_log_warnings_remarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,16 @@ def _get_test_data(self, log_instance):

tests_for_log_instance = {}

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

log_instance = log_instance.splitlines()

for line in log_instance:
test_match = re.search(pattern, line)
if test_match:
test_name, warnings, remarks = test_match.groups()
tests_for_log_instance[test_name] = (int(warnings), int(remarks))
tests_for_log_instance[test_name] = (warnings, remarks)

return tests_for_log_instance

Expand All @@ -92,17 +94,29 @@ def _get_pr_data(self, commit):
try:
log_text = self._fetch_log_text(commit)
log_data = self._get_test_data(log_text)
log_data = self._clean_data(log_data)
return log_data
except:
logging.error(f"No commit found for the ref {commit}")
sys.exit(1)

def _clean_data(self, test_data):
"""Convert None values to zeros in the test_data dictionary"""
clean_data = {
k: tuple(0 if v is None else int(v) for v in values)
for k, values in test_data.items()
}
return clean_data

def compare_results(self, pr_log, base_log):
"""Compare warnings/remarks for PR head and base commits to determine whether warnings/remarks have increased."""

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

for test in pr_log:
if test not in base_log:
logging.info(f"Skipped test {test}; nothing to compare against.")
continue
# Check warnings
if pr_log[test][0] > base_log[test][0]:
increases['warnings'].update({test: pr_log[test][0] - base_log[test][0]})
Expand Down Expand Up @@ -142,7 +156,7 @@ def main():
log._get_commits()
log.pr_log_data = log._get_pr_data(log.pr_head_commit)
log.base_log_data = log._get_pr_data(log.pr_base_commit)

increased_warnings_remarks[machine] = log.compare_results(log.pr_log_data, log.base_log_data)

results = print_html_results(increased_warnings_remarks)
Expand Down
2 changes: 1 addition & 1 deletion UFSATM
Open in desktop
Submodule UFSATM updated 1 files
+1 −1 ccpp/physics
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20260316
export BL_DATE=20260318
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Mar 17 17:59:19 UTC 2026
Thu Mar 19 01:48:20 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

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

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

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

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/rst_rst
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

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

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

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

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1173553/thr_thr
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_292538/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

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

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Mar 18 00:57:48 UTC 2026
Elapsed time: 06h:58m:29s. Have a nice day!
Thu Mar 19 02:55:22 UTC 2026
Elapsed time: 01h:07m:02s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_ursa.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Mar 17 18:00:19 UTC 2026
Thu Mar 19 01:49:27 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
Expand All @@ -15,14 +15,14 @@ Moving baseline bit_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

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

Test bit_base PASS


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

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

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-stmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_1182379/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/Fernando.Andrade-maldonado/ORT-ptmp/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_306481/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -52,14 +52,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

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

Test std_base PASS


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

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

Test thr PASS

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