Skip to content

FV3: Fix Prate_avg and UPP call freq + Fixing repo sync check with proper if...else block and re-instatiatin… #2859 #2836

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
jkbk2004 merged 25 commits into from
Aug 15, 2025
Merged

FV3: Fix Prate_avg and UPP call freq + Fixing repo sync check with proper if...else block and re-instatiatin… #2859 #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
327f7c3
Add FV3 changes and test_changes.list
dpsarmie Jul 30, 2025
63db44d
Merge branch 'develop' into fix/Prate-avg_uppCallFreq
dpsarmie Aug 5, 2025
fe52f11
Update single restart control variable changes
dpsarmie Aug 5, 2025
6631248
Update FV3
dpsarmie Aug 7, 2025
0ff78ff
Revert FV3
dpsarmie Aug 7, 2025
ac7ac21
Merge branch 'develop' into fix/Prate-avg_uppCallFreq
dpsarmie Aug 7, 2025
e801aa2
Update FV3
dpsarmie Aug 7, 2025
0416449
Merge branch 'develop' into fix/Prate-avg_uppCallFreq
dpsarmie Aug 13, 2025
24fac3d
Update to current UFS
dpsarmie Aug 13, 2025
b85bdb5
Merge branch 'develop' into fix/Prate-avg_uppCallFreq
dpsarmie Aug 13, 2025
be63e8d
Recommit changes
dpsarmie Aug 13, 2025
bbfb067
Add changes from #2859
dpsarmie Aug 13, 2025
6ca8f54
Update bl_date.conf
jkbk2004 Aug 13, 2025
573430a
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Aug 14, 2025
a40860d
Acorn RT Log: Passed
BrianCurtis-NOAA Aug 14, 2025
6e61a14
add hercules RT log: passed
jkbk2004 Aug 14, 2025
d835334
add orion RT log: passed
jkbk2004 Aug 14, 2025
934fac9
ORT Jobs Completed.
epic-cicd-jenkins Aug 15, 2025
26bb02f
ORT Jobs Completed.
epic-cicd-jenkins Aug 15, 2025
86d8aaa
add hera RT log passed
FernandoAndrade-NOAA Aug 15, 2025
bc34c74
add gaeac6 RT log passed
FernandoAndrade-NOAA Aug 15, 2025
1917e87
ORT Jobs Completed.
epic-cicd-jenkins Aug 15, 2025
6a029de
add derecho RT log: passed
jkbk2004 Aug 15, 2025
cb67544
add ursa RT log passed
FernandoAndrade-NOAA Aug 15, 2025
d599f2b
Revert .gitmodules and update FV3 hash
dpsarmie Aug 15, 2025
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 65884b to 40187b
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=20250811
export BL_DATE=20250813
9 changes: 4 additions & 5 deletions tests/ci/repo_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
#set -eu
set -eu

get_shas () {
cwd=$(pwd)
Expand Down Expand Up @@ -106,8 +106,7 @@ done
if [[ ! $flag_sync ]]; then
echo "** ${GITHUB_WORKSPACE} **NOT** up to date"
exit 1
else
echo "** ${GITHUB_WORKSPACE} up to date **"
exit 0
Comment thread
dpsarmie marked this conversation as resolved.
fi

echo "** ${GITHUB_WORKSPACE} up to date **"

exit 0
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Aug 12 05:26:57 UTC 2025
Fri Aug 15 08:41:47 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 250.989289
0: The maximum resident set size (KB) = 1562780
0: The total amount of wall time = 248.578435
0: The maximum resident set size (KB) = 1554256

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 863.847574
0: The maximum resident set size (KB) = 1553424
0: The total amount of wall time = 870.769967
0: The maximum resident set size (KB) = 1531148

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 229.385009
0: The maximum resident set size (KB) = 1534920
0: The total amount of wall time = 225.907286
0: The maximum resident set size (KB) = 1533160

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 234.547094
0: The maximum resident set size (KB) = 1519896
0: The total amount of wall time = 232.044313
0: The maximum resident set size (KB) = 1531328

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 227.388849
0: The maximum resident set size (KB) = 1520548
0: The total amount of wall time = 225.855252
0: The maximum resident set size (KB) = 1546152

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 228.023528
0: The maximum resident set size (KB) = 1533424
0: The total amount of wall time = 225.650228
0: The maximum resident set size (KB) = 1531460

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_96884/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_11966/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 = 226.477711
0: The maximum resident set size (KB) = 1522904
0: The total amount of wall time = 226.949446
0: The maximum resident set size (KB) = 1533944

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Aug 12 06:30:14 UTC 2025
Elapsed time: 01h:03m:17s. Have a nice day!
Fri Aug 15 09:44:32 UTC 2025
Elapsed time: 01h:02m:46s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Aug 12 04:03:41 UTC 2025
Fri Aug 15 07:19:36 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3504645/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4117359/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 2291.504333
0: The maximum resident set size (KB) = 1637768
0: The total amount of wall time = 2242.120019
0: The maximum resident set size (KB) = 1659608

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3504645/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4117359/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst results ....
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK

0: The total amount of wall time = 571.539200
0: The maximum resident set size (KB) = 1643668
0: The total amount of wall time = 568.745473
0: The maximum resident set size (KB) = 1642356

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3504645/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4117359/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 576.801742
0: The maximum resident set size (KB) = 1643464
0: The total amount of wall time = 569.693076
0: The maximum resident set size (KB) = 1653932

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Aug 12 05:26:57 UTC 2025
Elapsed time: 01h:23m:32s. Have a nice day!
Fri Aug 15 08:41:46 UTC 2025
Elapsed time: 01h:22m:11s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Tue Aug 12 03:10:13 UTC 2025
Fri Aug 15 06:26:33 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3003315/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4000576/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 = 612.231249
0: The maximum resident set size (KB) = 901604
0: The total amount of wall time = 602.337285
0: The maximum resident set size (KB) = 882004

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3003315/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4000576/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 = 494.760997
0: The maximum resident set size (KB) = 867336
0: The total amount of wall time = 485.902479
0: The maximum resident set size (KB) = 865728

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3003315/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4000576/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 = 491.090701
0: The maximum resident set size (KB) = 856800
0: The total amount of wall time = 493.031105
0: The maximum resident set size (KB) = 866392

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3003315/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_4000576/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 = 490.576819
0: The maximum resident set size (KB) = 856200
0: The total amount of wall time = 493.764601
0: The maximum resident set size (KB) = 853028

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Aug 12 04:03:25 UTC 2025
Elapsed time: 00h:53m:12s. Have a nice day!
Fri Aug 15 07:19:35 UTC 2025
Elapsed time: 00h:53m:02s. Have a nice day!
Loading