From b66da0d5ab84cad8fce86f793130fec89bc7fd35 Mon Sep 17 00:00:00 2001 From: jiandewang Date: Mon, 13 Jan 2025 12:22:06 -0500 Subject: [PATCH 1/2] point tMOM6 test branch --- .gitmodules | 6 ++++-- MOM6-interface/MOM6 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ab72b60a64..6569c12966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,8 +24,10 @@ branch = emc/develop [submodule "MOM6"] path = MOM6-interface/MOM6 - url = https://github.com/NOAA-EMC/MOM6 - branch = dev/emc +# url = https://github.com/NOAA-EMC/MOM6 +# branch = dev/emc + url = https://github.com/jiandewang/MOM6 + branch = feature/update-to-main-20241127 [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 8cc8b70f01..162aad89d5 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 8cc8b70f0143e803efb842ed871f9be3062862a4 +Subproject commit 162aad89d52ba3ce4369fb0adbe2bbb57d83918e From bc0822d5a3fcd1328f15242e1f7741f706257993 Mon Sep 17 00:00:00 2001 From: jiandewang Date: Mon, 13 Jan 2025 12:23:31 -0500 Subject: [PATCH 2/2] modify MOM6 cmake list --- MOM6-interface/mom6_files.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake index 1256888867..a8b48b7012 100644 --- a/MOM6-interface/mom6_files.cmake +++ b/MOM6-interface/mom6_files.cmake @@ -54,7 +54,9 @@ list(APPEND mom6_src_files MOM6/src/diagnostics/MOM_PointAccel.F90 MOM6/src/diagnostics/MOM_debugging.F90 MOM6/src/diagnostics/MOM_spatial_means.F90 + MOM6/src/diagnostics/MOM_diagnose_MLD.F90 MOM6/src/diagnostics/MOM_diagnostics.F90 + MOM6/src/diagnostics/MOM_harmonic_analysis.F90 MOM6/src/diagnostics/MOM_obsolete_diagnostics.F90 MOM6/src/diagnostics/MOM_obsolete_params.F90 MOM6/src/diagnostics/MOM_sum_output.F90 @@ -168,6 +170,7 @@ list(APPEND mom6_src_files MOM6/src/parameterizations/lateral/MOM_tidal_forcing.F90 MOM6/src/parameterizations/lateral/MOM_Zanna_Bolton.F90 MOM6/src/parameterizations/lateral/MOM_self_attr_load.F90 + MOM6/src/parameterizations/lateral/MOM_streaming_filter.F90 MOM6/src/parameterizations/vertical/MOM_ALE_sponge.F90 MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90 @@ -312,7 +315,9 @@ list(APPEND mom6_nuopc_src_files 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/timing_tests/time_MOM_EOS.F90 + MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90 ) list(APPEND mom6_nuopc_src_files