Skip to content

Update mom6 to its main repo. 20260828 commit #3344

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 15 commits into from
Sep 8, 2026
Merged

Update mom6 to its main repo. 20260828 commit #3344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
21c4661
point to MOm6 test branch
jiandewang Aug 28, 2026
8f42220
modify MOM6 cmake list
jiandewang Aug 28, 2026
381993b
check in test_changes.list and hercules run log
jiandewang Aug 30, 2026
fdc4c48
update test_changes.list & ursa log
gspetro-NOAA Aug 31, 2026
9155345
sync with develop branch
jiandewang Sep 2, 2026
90a5658
sync with develop branch
jiandewang Sep 3, 2026
0713a79
update bl_date.conf
gspetro-NOAA Sep 3, 2026
77f03ab
add gaeaC6 RT log passed
FernandoAndrade-NOAA Sep 4, 2026
3a6979e
[AutoRT] Hercules Job Completed Successfully.\n\n\n on-behalf-of @ufs…
epic-cicd-jenkins Sep 4, 2026
52016af
[AutoRT] Orion Job Completed Successfully.\n\n\n on-behalf-of @ufs-co…
epic-cicd-jenkins Sep 4, 2026
75a9693
Merge branch 'feature/update-MOM6-20260828' of github.com:jiandewang/…
epic-cicd-jenkins Sep 4, 2026
7eb005f
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Sep 4, 2026
49c80fe
derecho rt log - passed
gspetro-NOAA Sep 4, 2026
40d01e8
add ursa RT and ORT logs passed
FernandoAndrade-NOAA Sep 7, 2026
30ce91b
update .gitmodules & MOM6 hash
gspetro-NOAA Sep 8, 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
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 240 files
3 changes: 3 additions & 0 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ list(APPEND mom6_src_files
MOM6/src/ALE/Recon1d_PPM_H4_2018.F90
MOM6/src/ALE/Recon1d_PPM_H4_2019.F90
MOM6/src/ALE/Recon1d_PPM_hybgen.F90
MOM6/src/ALE/Recon1d_PLM_WLS.F90
MOM6/src/ALE/Recon1d_type.F90

MOM6/src/core/MOM.F90
Expand Down Expand Up @@ -133,6 +134,7 @@ list(APPEND mom6_src_files
MOM6/src/framework/MOM_coupler_types.F90
MOM6/src/framework/MOM_cpu_clock.F90
MOM6/src/framework/MOM_data_override.F90
MOM6/src/framework/MOM_diag_buffers.F90
MOM6/src/framework/MOM_diag_mediator.F90
MOM6/src/framework/MOM_diag_remap.F90
MOM6/src/framework/MOM_document.F90
Expand Down Expand Up @@ -184,6 +186,7 @@ list(APPEND mom6_src_files
MOM6/src/parameterizations/lateral/MOM_internal_tides.F90
MOM6/src/parameterizations/lateral/MOM_load_love_numbers.F90
MOM6/src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
MOM6/src/parameterizations/lateral/MOM_meso_sfn_ANN.F90
MOM6/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
MOM6/src/parameterizations/lateral/MOM_spherical_harmonics.F90
MOM6/src/parameterizations/lateral/MOM_thickness_diffuse.F90
Expand Down
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=20260825
export BL_DATE=20260903
62 changes: 31 additions & 31 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 @@
Thu Sep 3 07:55:52 UTC 2026
Thu Sep 3 19:55:29 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/bit_base_bit_base
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_1422783/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 = 828.985281
0: The maximum resident set size (KB) = 2606100
0: The total amount of wall time = 165.727692
0: The maximum resident set size (KB) = 2598288

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/dbg_base_dbg_base
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_1422783/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 = 2713.012123
0: The maximum resident set size (KB) = 2534276
0: The total amount of wall time = 2572.505951
0: The maximum resident set size (KB) = 2545772

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/dcp_dcp
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_1422783/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 = 118.336025
0: The maximum resident set size (KB) = 2487800
0: The total amount of wall time = 137.147047
0: The maximum resident set size (KB) = 2485932

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/mpi_mpi
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_1422783/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 = 137.297932
0: The maximum resident set size (KB) = 2492900
0: The total amount of wall time = 654.797286
0: The maximum resident set size (KB) = 2530300

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/rst_rst
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_1422783/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 = 115.771316
0: The maximum resident set size (KB) = 2495200
0: The total amount of wall time = 118.498929
0: The maximum resident set size (KB) = 2498480

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/std_base_std_base
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_1422783/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 = 870.800223
0: The maximum resident set size (KB) = 2527520
0: The total amount of wall time = 125.011171
0: The maximum resident set size (KB) = 2503776

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3713810/thr_thr
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_1422783/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 = 118.251130
0: The maximum resident set size (KB) = 2515508
0: The total amount of wall time = 123.127866
0: The maximum resident set size (KB) = 2496024

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 3 09:51:33 UTC 2026
Elapsed time: 01h:55m:41s. Have a nice day!
Fri Sep 4 03:07:58 UTC 2026
Elapsed time: 07h:12m:30s. Have a nice day!
38 changes: 19 additions & 19 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 @@
Thu Sep 3 06:00:42 UTC 2026
Thu Sep 3 19:56:40 UTC 2026
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3011355/bit_base_bit_base
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_1437536/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 = 308.624553
0: The maximum resident set size (KB) = 2071092
0: The total amount of wall time = 308.863172
0: The maximum resident set size (KB) = 2078328

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3011355/dcp_dcp
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_1437536/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 = 207.854974
0: The maximum resident set size (KB) = 1726540
0: The total amount of wall time = 208.354094
0: The maximum resident set size (KB) = 1725488

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3011355/std_base_std_base
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_1437536/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 = 217.484862
0: The maximum resident set size (KB) = 1715616
0: The total amount of wall time = 207.301195
0: The maximum resident set size (KB) = 1726256

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_intel
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3011355/thr_thr
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_1437536/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 = 208.639510
0: The maximum resident set size (KB) = 1718320
0: The total amount of wall time = 206.691088
0: The maximum resident set size (KB) = 1718268

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 3 07:54:34 UTC 2026
Elapsed time: 01h:53m:52s. Have a nice day!
Fri Sep 4 04:14:03 UTC 2026
Elapsed time: 08h:17m:23s. Have a nice day!
Loading
Loading