Skip to content

update MOM6 to its main repo. 20250113 commit (original 20241127-PR) #2556

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 4 commits into from
+10 −3
Closed

update MOM6 to its main repo. 20250113 commit (original 20241127-PR) #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b66da0d
point tMOM6 test branch
jiandewang Jan 13, 2025
bc0822d
modify MOM6 cmake list
jiandewang Jan 13, 2025
ddb79ce
Merge branch 'ufs-community:develop' into feature/update-MOM6-20241127
jiandewang Jan 13, 2025
96ca82e
Merge branch 'ufs-community:develop' into feature/update-MOM6-20241127
jiandewang Jan 17, 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-to-main-20241127
[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 154 files
5 changes: 5 additions & 0 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading