Skip to content

Update MOM6 to its main repo. 20250527 commit #2757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jiandewang wants to merge 8 commits into from
+29 −5
Closed

Update MOM6 to its main repo. 20250527 commit #2757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3ab0b9
using MOM6 test branch
jiandewang May 28, 2025
af6d10f
modify mom6 cmake list
jiandewang May 28, 2025
bbc632f
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 2, 2025
a59a4f3
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 5, 2025
b35c388
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 6, 2025
08eb045
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 12, 2025
5ea7fe8
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 20, 2025
3b963a3
Merge branch 'ufs-community:develop' into feature/update-MOM6-20250527
jiandewang Jun 26, 2025
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 173 files
26 changes: 24 additions & 2 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down