Skip to content

update mom6 to its main repo. 20250818 commit #2866

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 33 commits into from
Sep 15, 2025
+3,077 −2,657
Merged

update mom6 to its main repo. 20250818 commit #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0cb1ba4
point to MOM6 test branch
jiandewang Aug 18, 2025
aa7dd67
cleanup MOM_input
jiandewang Aug 19, 2025
62abf8f
switch to WRIGHT_FULL for EOS
jiandewang Aug 19, 2025
d990cbd
revert DEFAULT_ANSWER_DATE to current UFS settings
jiandewang Aug 21, 2025
d3b37cc
set default answe date to 20250818 but explicitly set WAVE_INTERFACE_…
jiandewang Aug 21, 2025
1945d65
update 1x1 MOM_input
jiandewang Aug 22, 2025
0e157d7
remove all BUG flag in MOM_input
jiandewang Aug 22, 2025
159ddcb
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Aug 25, 2025
7ecfdcf
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Aug 27, 2025
6f00498
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Aug 29, 2025
b4e820b
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Sep 2, 2025
4a73265
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Sep 7, 2025
fba38ce
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250818
jiandewang Sep 8, 2025
d8ed498
update test_changes.list
jiandewang Sep 8, 2025
9f2d946
update test_changes.list
jiandewang Sep 11, 2025
e7a752d
Update bl_date.conf
FernandoAndrade-NOAA Sep 11, 2025
366a5ab
Update test_changes.list fix format
FernandoAndrade-NOAA Sep 11, 2025
9b4c040
ORT Jobs Completed.
epic-cicd-jenkins Sep 11, 2025
3ab7769
ORT Jobs Completed.
epic-cicd-jenkins Sep 11, 2025
188f564
ORT Jobs Completed.
epic-cicd-jenkins Sep 11, 2025
4c9c6a7
update test_changes.list
jiandewang Sep 12, 2025
e38f942
Acorn RT Log: Passed
BrianCurtis-NOAA Sep 12, 2025
0089f8f
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Sep 12, 2025
ffb6e99
add hera and ursa RT log passed
FernandoAndrade-NOAA Sep 12, 2025
787d586
add gaeaC6 RT log passed
FernandoAndrade-NOAA Sep 12, 2025
7fc90e8
orion rt log - passed
gspetro-NOAA Sep 15, 2025
5977090
Merge branch 'feature/update-MOM6-20250818' of https://github.com/jia…
gspetro-NOAA Sep 15, 2025
1fa468d
hercules rt log - passed
gspetro-NOAA Sep 15, 2025
efee8af
Merge branch 'feature/update-MOM6-20250818' of https://github.com/jia…
gspetro-NOAA Sep 15, 2025
b65708f
add cpld_restart_gfsv17_iau_intel in test_change.list
jiandewang Sep 15, 2025
39f8c63
remove cpld_restart_gfsv17_iau from test_change.list
jiandewang Sep 15, 2025
0347a1d
revert submodule
jiandewang Sep 15, 2025
2610839
remove unnecessary underscore in test_change.list
jiandewang Sep 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 MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 31 files
+1 −1 .testing/tc0/MOM_input
+1 −1 .testing/tc1.a/MOM_tc_variant
+1 −1 .testing/tc1.b/MOM_tc_variant
+14 −0 .testing/tc1/MOM_input
+13 −0 .testing/tc2/MOM_input
+5 −0 .testing/tc3/MOM_input
+4 −1 .testing/tc4/MOM_input
+25 −1 config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90
+1 −1 src/ALE/MOM_regridding.F90
+7 −27 src/core/MOM.F90
+7 −4 src/core/MOM_PressureForce_FV.F90
+1 −1 src/core/MOM_barotropic.F90
+1 −1 src/core/MOM_dynamics_split_RK2.F90
+1 −1 src/core/MOM_dynamics_split_RK2b.F90
+0 −30 src/core/MOM_dynamics_unsplit.F90
+0 −30 src/core/MOM_dynamics_unsplit_RK2.F90
+13 −0 src/diagnostics/MOM_obsolete_params.F90
+1 −1 src/equation_of_state/MOM_EOS.F90
+20 −81 src/parameterizations/lateral/MOM_hor_visc.F90
+2 −6 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+1 −1 src/parameterizations/vertical/MOM_CVMix_KPP.F90
+3 −26 src/parameterizations/vertical/MOM_bkgnd_mixing.F90
+2 −4 src/parameterizations/vertical/MOM_set_diffusivity.F90
+57 −121 src/parameterizations/vertical/MOM_vert_friction.F90
+1 −1 src/tracer/MOM_neutral_diffusion.F90
+1 −5 src/tracer/MOM_tracer_Z_init.F90
+2 −7 src/tracer/MOM_tracer_hor_diff.F90
+1 −5 src/user/Idealized_Hurricane.F90
+1 −2 src/user/Kelvin_initialization.F90
+2 −7 src/user/MOM_wave_interface.F90
+1 −1 src/user/shelfwave_initialization.F90
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=20250908
export BL_DATE=20250911
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 Sep 9 09:11:37 UTC 2025
Thu Sep 11 20:57:56 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_372803/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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.365387
0: The maximum resident set size (KB) = 1568436
0: The total amount of wall time = 248.435842
0: The maximum resident set size (KB) = 1557648

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_372803/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 906.460404
0: The maximum resident set size (KB) = 1551448
0: The total amount of wall time = 896.908058
0: The maximum resident set size (KB) = 1542396

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_372803/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 226.947045
0: The maximum resident set size (KB) = 1545760
0: The total amount of wall time = 225.554497
0: The maximum resident set size (KB) = 1547840

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_372803/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 226.055280
0: The maximum resident set size (KB) = 1537864
0: The total amount of wall time = 228.682329
0: The maximum resident set size (KB) = 1544624

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_372803/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 228.934795
0: The maximum resident set size (KB) = 1546500
0: The total amount of wall time = 227.451526
0: The maximum resident set size (KB) = 1549020

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_372803/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 226.847159
0: The maximum resident set size (KB) = 1535404
0: The total amount of wall time = 231.718687
0: The maximum resident set size (KB) = 1536928

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_372803/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_5133/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 = 225.856387
0: The maximum resident set size (KB) = 1544660
0: The total amount of wall time = 226.918196
0: The maximum resident set size (KB) = 1535024

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Sep 9 10:17:44 UTC 2025
Elapsed time: 01h:06m:08s. Have a nice day!
Thu Sep 11 22:21:43 UTC 2025
Elapsed time: 01h:23m:48s. 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 Sep 9 07:52:07 UTC 2025
Thu Sep 11 19:31:01 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_247371/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/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 = 2320.458355
0: The maximum resident set size (KB) = 1636444
0: The total amount of wall time = 2305.709842
0: The maximum resident set size (KB) = 1659580

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_247371/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/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 = 581.218274
0: The maximum resident set size (KB) = 1642476
0: The total amount of wall time = 589.246601
0: The maximum resident set size (KB) = 1638076

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_247371/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3856063/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 = 580.882811
0: The maximum resident set size (KB) = 1644212
0: The total amount of wall time = 585.000271
0: The maximum resident set size (KB) = 1632412

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Sep 9 09:15:06 UTC 2025
Elapsed time: 01h:23m:00s. Have a nice day!
Thu Sep 11 20:57:55 UTC 2025
Elapsed time: 01h:26m:55s. 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 Sep 9 06:59:04 UTC 2025
Thu Sep 11 18:36:17 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_189757/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/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 = 606.364726
0: The maximum resident set size (KB) = 891580
0: The total amount of wall time = 618.615416
0: The maximum resident set size (KB) = 887876

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_189757/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/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 = 492.565574
0: The maximum resident set size (KB) = 866904
0: The total amount of wall time = 493.356681
0: The maximum resident set size (KB) = 864740

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_189757/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/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 = 494.774112
0: The maximum resident set size (KB) = 861444
0: The total amount of wall time = 493.811962
0: The maximum resident set size (KB) = 867032

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_189757/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3627644/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 = 499.130309
0: The maximum resident set size (KB) = 867012
0: The total amount of wall time = 490.811133
0: The maximum resident set size (KB) = 866448

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Sep 9 07:52:06 UTC 2025
Elapsed time: 00h:53m:03s. Have a nice day!
Thu Sep 11 19:31:22 UTC 2025
Elapsed time: 00h:55m:05s. Have a nice day!
Loading