Skip to content

update MOM6 to its main repo. 20250801 commit #2849

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 1 commit into from
+8 −7
Closed

update MOM6 to its main repo. 20250801 commit #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-20250801
[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 76 files
+0 −45 .github/actions/testing-setup/action.yml
+270 −385 .github/workflows/verify-linux.yml
+186 −233 .github/workflows/verify-macos.yml
+40 −19 .testing/Makefile
+37 −12 .testing/tools/disp_timing.py
+5 −1 config_src/drivers/ice_solo_driver/ice_shelf_driver.F90
+135 −0 config_src/drivers/timing_tests/time_reproducing_sum.F90
+0 −219 config_src/drivers/unit_drivers/MOM_sum_driver.F90
+2 −2 config_src/drivers/unit_tests/test_numerical_testing_type.F90
+209 −0 config_src/drivers/unit_tests/test_reproducing_sum.F90
+0 −45 config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
+252 −899 config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90
+0 −149 config_src/external/GFDL_ocean_BGC/generic_tracer.F90
+0 −355 config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
+4 −2 config_src/infra/FMS1/MOM_domain_infra.F90
+4 −2 config_src/infra/FMS2/MOM_domain_infra.F90
+30 −14 src/ALE/MOM_ALE.F90
+109 −56 src/core/MOM.F90
+5 −1 src/core/MOM_PressureForce_FV.F90
+145 −64 src/core/MOM_barotropic.F90
+17 −2 src/core/MOM_boundary_update.F90
+37 −42 src/core/MOM_continuity_PPM.F90
+12 −4 src/core/MOM_dynamics_split_RK2.F90
+12 −4 src/core/MOM_dynamics_split_RK2b.F90
+3 −2 src/core/MOM_dynamics_unsplit.F90
+3 −2 src/core/MOM_dynamics_unsplit_RK2.F90
+27 −25 src/core/MOM_forcing_type.F90
+2 −2 src/core/MOM_grid.F90
+70 −5 src/core/MOM_interface_heights.F90
+90 −19 src/core/MOM_isopycnal_slopes.F90
+1,430 −807 src/core/MOM_open_boundary.F90
+2 −1 src/core/MOM_variables.F90
+10 −10 src/diagnostics/MOM_debugging.F90
+23 −20 src/diagnostics/MOM_diagnose_KdWork.F90
+151 −48 src/diagnostics/MOM_diagnose_MLD.F90
+5 −45 src/diagnostics/MOM_diagnostics.F90
+39 −17 src/diagnostics/MOM_sum_output.F90
+199 −86 src/equation_of_state/MOM_EOS.F90
+2 −2 src/equation_of_state/MOM_EOS_TEOS10.F90
+139 −59 src/equation_of_state/MOM_EOS_linear.F90
+21 −13 src/framework/MOM_checksums.F90
+1 −0 src/framework/MOM_coms.F90
+1 −0 src/framework/MOM_domains.F90
+110 −74 src/framework/numerical_testing_type.F90
+2 −7 src/initialization/MOM_fixed_initialization.F90
+100 −44 src/initialization/MOM_state_initialization.F90
+43 −20 src/ocean_data_assim/MOM_oda_driver.F90
+89 −92 src/parameterizations/lateral/MOM_hor_visc.F90
+157 −132 src/parameterizations/lateral/MOM_internal_tides.F90
+290 −144 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+84 −46 src/parameterizations/lateral/MOM_self_attr_load.F90
+5 −1 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+6 −8 src/parameterizations/stochastic/MOM_stochastics.F90
+3 −1 src/parameterizations/vertical/MOM_diabatic_aux.F90
+52 −19 src/parameterizations/vertical/MOM_diabatic_driver.F90
+630 −178 src/parameterizations/vertical/MOM_energetic_PBL.F90
+55 −5 src/parameterizations/vertical/MOM_geothermal.F90
+124 −64 src/parameterizations/vertical/MOM_kappa_shear.F90
+18 −17 src/parameterizations/vertical/MOM_set_diffusivity.F90
+49 −29 src/parameterizations/vertical/MOM_set_viscosity.F90
+1,773 −1,109 src/parameterizations/vertical/MOM_vert_friction.F90
+2 −2 src/tracer/MARBL_tracers.F90
+2 −2 src/tracer/MOM_hor_bnd_diffusion.F90
+5 −1 src/tracer/MOM_tracer_Z_init.F90
+7 −18 src/tracer/MOM_tracer_advect.F90
+5 −1 src/tracer/MOM_tracer_hor_diff.F90
+2 −2 src/tracer/oil_tracer.F90
+5 −1 src/user/Idealized_Hurricane.F90
+176 −68 src/user/Kelvin_initialization.F90
+5 −2 src/user/MOM_wave_interface.F90
+1 −1 src/user/RGC_initialization.F90
+2 −9 src/user/dumbbell_initialization.F90
+87 −27 src/user/dyed_channel_initialization.F90
+64 −33 src/user/shelfwave_initialization.F90
+10 −2 src/user/supercritical_initialization.F90
+48 −15 src/user/tidal_bay_initialization.F90
7 changes: 3 additions & 4 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down