diff --git a/.gitmodules b/.gitmodules index ab72b60a64..d3e4ebc969 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-MOM6-20250801 [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index f9e6e2e168..1cc54903eb 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit f9e6e2e1686458df842a0b92c61ff241a920ed84 +Subproject commit 1cc54903eb23f361c301f9a96e7a322642d74318 diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake index 98b7442d62..4357cdedb3 100644 --- a/MOM6-interface/mom6_files.cmake +++ b/MOM6-interface/mom6_files.cmake @@ -299,9 +299,6 @@ list(APPEND mom6_src_files MOM6/src/ocean_data_assim/MOM_oda_driver.F90 MOM6/src/ocean_data_assim/MOM_oda_incupd.F90 - MOM6/config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90 - MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 - MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90 MOM6/config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90 MOM6/config_src/external/ODA_hooks/kdtree.f90 MOM6/config_src/external/ODA_hooks/ocean_da_core.F90 @@ -343,9 +340,11 @@ list(APPEND mom6_nuopc_src_files 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_EOS.F90 MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90 - MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90 + MOM6/config_src/drivers/timing_tests/time_reproducing_sum.F90 ) list(APPEND mom6_nuopc_src_files