Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Submodule MOM6 updated 66 files
+1 −1 ac/makedep
+9 −9 config_src/drivers/nuopc_cap/mom_cap_methods.F90
+189 −0 config_src/drivers/timing_tests/time_MOM_ANN.F90
+10 −0 config_src/drivers/unit_tests/test_MOM_ANN.F90
+32 −23 src/ALE/MOM_ALE.F90
+2 −2 src/ALE/MOM_hybgen_regrid.F90
+3 −3 src/ALE/MOM_hybgen_unmix.F90
+511 −122 src/ALE/MOM_regridding.F90
+18 −18 src/ALE/MOM_remapping.F90
+120 −34 src/ALE/coord_hycom.F90
+53 −43 src/core/MOM.F90
+900 −36 src/core/MOM_CoriolisAdv.F90
+348 −57 src/core/MOM_barotropic.F90
+2 −2 src/core/MOM_checksum_packages.F90
+95 −34 src/core/MOM_continuity_PPM.F90
+67 −35 src/core/MOM_dynamics_split_RK2.F90
+62 −24 src/core/MOM_dynamics_split_RK2b.F90
+13 −7 src/core/MOM_dynamics_unsplit.F90
+16 −7 src/core/MOM_dynamics_unsplit_RK2.F90
+866 −429 src/core/MOM_open_boundary.F90
+4 −4 src/diagnostics/MOM_PointAccel.F90
+13 −33 src/diagnostics/MOM_debugging.F90
+198 −86 src/diagnostics/MOM_harmonic_analysis.F90
+2 −4 src/diagnostics/MOM_sum_output.F90
+734 −0 src/framework/MOM_ANN.F90
+1 −1 src/framework/MOM_checksums.F90
+1 −1 src/framework/MOM_coms.F90
+7 −8 src/framework/MOM_diag_mediator.F90
+3 −2 src/framework/MOM_diag_remap.F90
+7 −7 src/framework/MOM_domains.F90
+1 −1 src/framework/MOM_horizontal_regridding.F90
+2 −2 src/framework/MOM_io.F90
+16 −26 src/framework/MOM_restart.F90
+14 −15 src/framework/MOM_unique_scales.F90
+2 −4 src/ice_shelf/MOM_ice_shelf_dynamics.F90
+19 −3 src/initialization/MOM_fixed_initialization.F90
+88 −14 src/initialization/MOM_grid_initialize.F90
+27 −17 src/initialization/MOM_state_initialization.F90
+2 −2 src/ocean_data_assim/MOM_oda_driver.F90
+1 −1 src/ocean_data_assim/MOM_oda_incupd.F90
+7 −5 src/parameterizations/lateral/MOM_MEKE.F90
+181 −12 src/parameterizations/lateral/MOM_Zanna_Bolton.F90
+18 −4 src/parameterizations/lateral/MOM_hor_visc.F90
+362 −34 src/parameterizations/lateral/MOM_internal_tides.F90
+147 −79 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+1 −1 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+3 −21 src/parameterizations/lateral/MOM_tidal_forcing.F90
+2 −2 src/parameterizations/vertical/MOM_ALE_sponge.F90
+3 −3 src/parameterizations/vertical/MOM_diabatic_aux.F90
+7 −7 src/parameterizations/vertical/MOM_opacity.F90
+3 −3 src/parameterizations/vertical/MOM_sponge.F90
+905 −1,278 src/parameterizations/vertical/MOM_vert_friction.F90
+1 −2 src/tracer/DOME_tracer.F90
+1 −2 src/tracer/ISOMIP_tracer.F90
+10 −10 src/tracer/MOM_neutral_diffusion.F90
+1 −1 src/tracer/MOM_tracer_diabatic.F90
+5 −5 src/tracer/MOM_tracer_flow_control.F90
+3 −3 src/tracer/MOM_tracer_registry.F90
+1 −2 src/tracer/RGC_tracer.F90
+1 −2 src/tracer/advection_test_tracer.F90
+0 −1 src/tracer/dyed_obc_tracer.F90
+1 −2 src/tracer/tracer_example.F90
+1 −2 src/user/DOME_initialization.F90
+23 −3 src/user/Kelvin_initialization.F90
+1 −2 src/user/MOM_controlled_forcing.F90
+16 −0 src/user/MOM_wave_interface.F90
3 changes: 3 additions & 0 deletions MOM6-interface/mom6_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ list(APPEND mom6_src_files
MOM6/src/equation_of_state/TEOS10/gsw_t_freezing_poly.f90
MOM6/src/equation_of_state/TEOS10/gsw_t_from_ct.f90

MOM6/src/framework/MOM_ANN.F90
MOM6/src/framework/MOM_array_transform.F90
MOM6/src/framework/MOM_checksums.F90
MOM6/src/framework/MOM_coms.F90
Expand Down Expand Up @@ -338,13 +339,15 @@ list(APPEND mom6_nuopc_src_files
MOM6/config_src/drivers/nuopc_cap/mom_ufs_trace_wrapper.F90
MOM6/config_src/drivers/nuopc_cap/mom_inline_mod.F90
MOM6/config_src/drivers/nuopc_cap/mom_cap_outputlog.F90
MOM6/config_src/drivers/unit_tests/test_MOM_ANN.F90
MOM6/config_src/drivers/unit_tests/test_MOM_file_parser.F90
MOM6/config_src/drivers/unit_tests/test_MOM_mixedlayer_restrat.F90
MOM6/config_src/drivers/unit_tests/test_MOM_string_functions.F90
MOM6/config_src/drivers/unit_tests/test_MOM_EOS.F90
MOM6/config_src/drivers/unit_tests/test_MOM_remapping.F90
MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90
MOM6/config_src/drivers/unit_tests/test_reproducing_sum.F90
MOM6/config_src/drivers/timing_tests/time_MOM_ANN.F90
MOM6/config_src/drivers/timing_tests/time_MOM_EOS.F90
MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90
MOM6/config_src/drivers/timing_tests/time_reproducing_sum.F90
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20260121
export BL_DATE=20260126
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 23 18:53:42 UTC 2026
Mon Jan 26 18:04:33 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_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2347530/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 255.824754
0: The maximum resident set size (KB) = 1526824
0: The total amount of wall time = 258.656677
0: The maximum resident set size (KB) = 1554148

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_2347530/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 868.518428
0: The maximum resident set size (KB) = 1517664
0: The total amount of wall time = 873.354186
0: The maximum resident set size (KB) = 1519924

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_2347530/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 233.405892
0: The maximum resident set size (KB) = 1530872
0: The total amount of wall time = 234.031256
0: The maximum resident set size (KB) = 1526860

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_2347530/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 236.100647
0: The maximum resident set size (KB) = 1511708
0: The total amount of wall time = 228.426426
0: The maximum resident set size (KB) = 1515888

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_2347530/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 232.524008
0: The maximum resident set size (KB) = 1512624
0: The total amount of wall time = 230.929498
0: The maximum resident set size (KB) = 1538760

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_2347530/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 250.230663
0: The maximum resident set size (KB) = 1525980
0: The total amount of wall time = 230.963591
0: The maximum resident set size (KB) = 1536768

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_2347530/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3391483/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 = 229.764440
0: The maximum resident set size (KB) = 1525784
0: The total amount of wall time = 229.027869
0: The maximum resident set size (KB) = 1522952

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 23 20:02:09 UTC 2026
Elapsed time: 01h:08m:28s. Have a nice day!
Mon Jan 26 19:20:54 UTC 2026
Elapsed time: 01h:16m:21s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 23 17:25:50 UTC 2026
Mon Jan 26 16:39:02 UTC 2026
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_1816324/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2879611/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 = 2327.392823
0: The maximum resident set size (KB) = 1648504
0: The total amount of wall time = 2288.486830
0: The maximum resident set size (KB) = 1647952

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_1816324/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2879611/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 = 586.082854
0: The maximum resident set size (KB) = 1619860
0: The total amount of wall time = 582.312370
0: The maximum resident set size (KB) = 1632856

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_1816324/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2879611/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 = 590.884302
0: The maximum resident set size (KB) = 1642556
0: The total amount of wall time = 587.632550
0: The maximum resident set size (KB) = 1643404

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 23 18:53:41 UTC 2026
Elapsed time: 01h:27m:51s. Have a nice day!
Mon Jan 26 18:04:33 UTC 2026
Elapsed time: 01h:25m:31s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jan 23 16:24:30 UTC 2026
Mon Jan 26 15:45:16 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_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_1702629/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2470922/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 = 623.365486
0: The maximum resident set size (KB) = 877632
0: The total amount of wall time = 615.576572
0: The maximum resident set size (KB) = 875408

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_1702629/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2470922/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 = 497.050772
0: The maximum resident set size (KB) = 873564
0: The total amount of wall time = 498.469067
0: The maximum resident set size (KB) = 873156

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_1702629/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2470922/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 = 504.185941
0: The maximum resident set size (KB) = 861716
0: The total amount of wall time = 498.644557
0: The maximum resident set size (KB) = 863208

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_1702629/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2470922/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.149476
0: The maximum resident set size (KB) = 873916
0: The total amount of wall time = 503.318635
0: The maximum resident set size (KB) = 866040

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Fri Jan 23 17:25:50 UTC 2026
Elapsed time: 01h:01m:21s. Have a nice day!
Mon Jan 26 16:39:02 UTC 2026
Elapsed time: 00h:53m:47s. Have a nice day!
Loading