Updated MOM6 tag so now we can do bgc sponge

NOAA-GFDL · Nov 18, 2024 · ee33b12 · ee33b12
1 parent d993366
commit ee33b12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -38,11 +38,11 @@
 	path = src/coupler
 	url = https://github.com/NOAA-GFDL/FMScoupler.git
 	branch = 2024.03
-[submodule "src/MOM6"]
-	path = src/MOM6
-	url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git
-	branch = dev/cefi
 [submodule "src/ocean_BGC"]
 	path = src/ocean_BGC
 	url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/ocean_BGC.git
 	branch = dev/cefi
+[submodule "src/MOM6"]
+	path = src/MOM6
+	url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git
+	branch = dev/cefi
diff --git a/src/MOM6 b/src/MOM6
+3 −0		.codecov.yml
+1 −1		.github/workflows/coupled-api.yml
+5 −11		.github/workflows/coverage.yml
+1 −1		.github/workflows/documentation-and-style.yml
+1 −1		.github/workflows/expression.yml
+1 −1		.github/workflows/macos-regression.yml
+1 −1		.github/workflows/macos-stencil.yml
+1 −1		.github/workflows/other.yml
+1 −1		.github/workflows/perfmon.yml
+1 −1		.github/workflows/regression.yml
+1 −1		.github/workflows/stencil.yml
+46 −46		.gitlab-ci.yml
+4 −7		.testing/Makefile
+3 −0		.testing/tc0/MOM_input
+3 −0		.testing/tc1/MOM_input
+3 −0		.testing/tc2/MOM_input
+3 −0		.testing/tc3/MOM_input
+3 −0		.testing/tc4/MOM_input
+5 −2		config_src/drivers/timing_tests/time_MOM_remapping.F90
+27 −78		src/ALE/MOM_ALE.F90
+61 −53		src/ALE/MOM_remapping.F90
+1 −1		src/ALE/P1M_functions.F90
+16 −26		src/ALE/P3M_functions.F90
+5 −13		src/ALE/PLM_functions.F90
+5 −15		src/ALE/PPM_functions.F90
+24 −32		src/ALE/PQM_functions.F90
+4 −4		src/ALE/coord_hycom.F90
+4 −4		src/ALE/coord_rho.F90
+40 −72		src/ALE/regrid_edge_values.F90
+16 −12		src/ALE/regrid_interp.F90
+15 −23		src/ALE/remapping_attic.F90
+12 −8		src/core/MOM.F90
+6 −7		src/core/MOM_barotropic.F90
+10 −39		src/core/MOM_continuity_PPM.F90
+13 −14		src/core/MOM_dynamics_split_RK2.F90
+14 −14		src/core/MOM_dynamics_split_RK2b.F90
+103 −80		src/core/MOM_open_boundary.F90
+40 −24		src/core/MOM_porous_barriers.F90
+0 −1		src/core/MOM_variables.F90
+4 −4		src/diagnostics/MOM_PointAccel.F90
+1 −1		src/diagnostics/MOM_diagnostics.F90
+24 −17		src/diagnostics/MOM_wave_speed.F90
+8 −16		src/framework/MOM_diag_remap.F90
+15 −9		src/ice_shelf/MOM_ice_shelf.F90
+385 −159		src/ice_shelf/MOM_ice_shelf_dynamics.F90
+1 −0		src/initialization/MOM_fixed_initialization.F90
+33 −28		src/initialization/MOM_state_initialization.F90
+15 −12		src/initialization/MOM_tracer_initialization_from_Z.F90
+15 −25		src/ocean_data_assim/MOM_oda_driver.F90
+32 −35		src/ocean_data_assim/MOM_oda_incupd.F90
+32 −2		src/parameterizations/lateral/MOM_MEKE.F90
+1 −0		src/parameterizations/lateral/MOM_MEKE_types.F90
+49 −17		src/parameterizations/lateral/MOM_hor_visc.F90
+10 −6		src/parameterizations/lateral/MOM_internal_tides.F90
+242 −13		src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+7 −7		src/parameterizations/lateral/MOM_thickness_diffuse.F90
+32 −31		src/parameterizations/vertical/MOM_ALE_sponge.F90
+4 −6		src/parameterizations/vertical/MOM_set_diffusivity.F90
+9 −6		src/parameterizations/vertical/MOM_tidal_mixing.F90
+9 −7		src/parameterizations/vertical/MOM_vert_friction.F90
+147 −0		src/tracer/MOM_generic_tracer.F90
+10 −11		src/tracer/MOM_hor_bnd_diffusion.F90
+19 −13		src/tracer/MOM_neutral_diffusion.F90
+18 −17		src/tracer/MOM_tracer_hor_diff.F90