From f3ab0b9280eff312c09c54085fd634ceba6b62de Mon Sep 17 00:00:00 2001 From: jiandewang Date: Tue, 27 May 2025 23:08:21 -0400 Subject: [PATCH 1/2] using MOM6 test branch --- .gitmodules | 6 ++++-- MOM6-interface/MOM6 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ab72b60a64..186d03d872 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-20250527 [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 8c52e6a9e3..c987a8b70d 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 8c52e6a9e36c94f5e0f6adbed715973a7ee0e3dc +Subproject commit c987a8b70d3772d258db62c9081a249b94935b39 From af6d10f6fa5a523f2847fc39d51e66d7d9c816a6 Mon Sep 17 00:00:00 2001 From: jiandewang Date: Tue, 27 May 2025 23:12:58 -0400 Subject: [PATCH 2/2] modify mom6 cmake list --- MOM6-interface/mom6_files.cmake | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake index 6904ccc5fc..98b7442d62 100644 --- a/MOM6-interface/mom6_files.cmake +++ b/MOM6-interface/mom6_files.cmake @@ -21,7 +21,23 @@ list(APPEND mom6_src_files MOM6/src/ALE/regrid_edge_values.F90 MOM6/src/ALE/regrid_interp.F90 MOM6/src/ALE/regrid_solvers.F90 - MOM6/src/ALE/remapping_attic.F90 + MOM6/src/ALE/Recon1d_EMPLM_CWK.F90 + MOM6/src/ALE/Recon1d_EMPLM_WA.F90 + MOM6/src/ALE/Recon1d_EMPLM_WA_poly.F90 + MOM6/src/ALE/Recon1d_EPPM_CWK.F90 + MOM6/src/ALE/Recon1d_MPLM_CWK.F90 + MOM6/src/ALE/Recon1d_MPLM_WA.F90 + MOM6/src/ALE/Recon1d_MPLM_WA_poly.F90 + MOM6/src/ALE/Recon1d_PCM.F90 + MOM6/src/ALE/Recon1d_PLM_CW.F90 + MOM6/src/ALE/Recon1d_PLM_CWK.F90 + MOM6/src/ALE/Recon1d_PLM_hybgen.F90 + MOM6/src/ALE/Recon1d_PPM_CW.F90 + MOM6/src/ALE/Recon1d_PPM_CWK.F90 + 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_type.F90 MOM6/src/core/MOM.F90 MOM6/src/core/MOM_CoriolisAdv.F90 @@ -61,6 +77,7 @@ list(APPEND mom6_src_files MOM6/src/diagnostics/MOM_obsolete_params.F90 MOM6/src/diagnostics/MOM_sum_output.F90 MOM6/src/diagnostics/MOM_wave_speed.F90 + MOM6/src/diagnostics/MOM_diagnose_KdWork.F90 MOM6/src/equation_of_state/MOM_EOS_base_type.F90 MOM6/src/equation_of_state/MOM_EOS.F90 @@ -141,6 +158,8 @@ list(APPEND mom6_src_files MOM6/src/framework/MOM_unit_testing.F90 MOM6/src/framework/MOM_write_cputime.F90 MOM6/src/framework/testing/MOM_file_parser_tests.F90 + MOM6/src/framework/MOM_murmur_hash.F90 + MOM6/src/framework/numerical_testing_type.F90 MOM6/src/ice_shelf/MOM_ice_shelf.F90 MOM6/src/ice_shelf/MOM_ice_shelf_diag_mediator.F90 @@ -208,13 +227,13 @@ list(APPEND mom6_src_files MOM6/src/parameterizations/CVmix/cvmix_utils.F90 MOM6/src/parameterizations/stochastic/MOM_stochastics.F90 + MOM6/src/parameterizations/lateral/MOM_wave_drag.F90 MOM6/src/tracer/DOME_tracer.F90 MOM6/src/tracer/ISOMIP_tracer.F90 MOM6/src/tracer/MOM_OCMIP2_CFC.F90 - MOM6/src/tracer/MOM_generic_tracer.F90 MOM6/src/tracer/MOM_hor_bnd_diffusion.F90 MOM6/src/tracer/MOM_neutral_diffusion.F90 MOM6/src/tracer/nw2_tracers.F90 @@ -239,6 +258,7 @@ list(APPEND mom6_src_files MOM6/src/tracer/MOM_CFC_cap.F90 MOM6/src/tracer/MARBL_forcing_mod.F90 MOM6/src/tracer/MARBL_tracers.F90 + MOM6/src/tracer/MOM_tracer_advect_schemes.F90 MOM6/src/user/BFB_initialization.F90 MOM6/src/user/BFB_surface_forcing.F90 @@ -282,6 +302,7 @@ list(APPEND mom6_src_files 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 MOM6/config_src/external/ODA_hooks/ocean_da_types.F90 @@ -324,6 +345,7 @@ list(APPEND mom6_nuopc_src_files 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 + MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90 ) list(APPEND mom6_nuopc_src_files