From 1cb2f3291a115f9e9ba76f9a0b577830c19f4e1c Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Wed, 9 Jul 2025 09:42:57 -0400 Subject: [PATCH] updated MOM6 to f9e6e2e --- external/mom6/MOM6 | 2 +- external/mom6/mom6_files.cmake | 29 +++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/external/mom6/MOM6 b/external/mom6/MOM6 index f355c30a..f9e6e2e1 160000 --- a/external/mom6/MOM6 +++ b/external/mom6/MOM6 @@ -1 +1 @@ -Subproject commit f355c30a9a102063264510dd0a34d450a5147f14 +Subproject commit f9e6e2e1686458df842a0b92c61ff241a920ed84 diff --git a/external/mom6/mom6_files.cmake b/external/mom6/mom6_files.cmake index 6d6733bb..bcaa4867 100644 --- a/external/mom6/mom6_files.cmake +++ b/external/mom6/mom6_files.cmake @@ -8,6 +8,23 @@ list(APPEND mom6_src_files MOM6/src/ALE/PLM_functions.F90 MOM6/src/ALE/PPM_functions.F90 MOM6/src/ALE/PQM_functions.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/ALE/coord_adapt.F90 MOM6/src/ALE/coord_hycom.F90 MOM6/src/ALE/coord_rho.F90 @@ -21,7 +38,6 @@ 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/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 @@ -140,8 +157,9 @@ list(APPEND mom6_src_files MOM6/src/framework/MOM_unique_scales.F90 MOM6/src/framework/MOM_unit_testing.F90 MOM6/src/framework/MOM_write_cputime.F90 + MOM6/src/framework/numerical_testing_type.F90 MOM6/src/framework/testing/MOM_file_parser_tests.F90 - + MOM6/src/framework/MOM_murmur_hash.F90 MOM6/src/ice_shelf/MOM_ice_shelf.F90 MOM6/src/ice_shelf/MOM_ice_shelf_diag_mediator.F90 MOM6/src/ice_shelf/MOM_ice_shelf_dynamics.F90 @@ -171,6 +189,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_wave_drag.F90 MOM6/src/parameterizations/vertical/MOM_ALE_sponge.F90 MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90 @@ -215,7 +234,6 @@ list(APPEND mom6_src_files MOM6/src/tracer/MARBL_tracers.F90 MOM6/src/tracer/MARBL_forcing_mod.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 @@ -238,6 +256,7 @@ list(APPEND mom6_src_files MOM6/src/tracer/pseudo_salt_tracer.F90 MOM6/src/tracer/tracer_example.F90 MOM6/src/tracer/MOM_CFC_cap.F90 + MOM6/src/tracer/MOM_tracer_advect_schemes.F90 MOM6/src/user/BFB_initialization.F90 MOM6/src/user/BFB_surface_forcing.F90 @@ -281,6 +300,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 @@ -307,8 +327,9 @@ list(APPEND mom6_src_files MOM6/config_src/infra/FMS2/MOM_io_infra.F90 MOM6/config_src/infra/FMS2/MOM_time_manager.F90 + MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90 ) - + # list(APPEND mom6_nuopc_src_files # MOM6/config_src/drivers/nuopc_cap/mom_cap.F90 # MOM6/config_src/drivers/nuopc_cap/time_utils.F90