bump up MOM6 and MARBL tags

ESCOMP · Nov 1, 2024 · a2e713c · a2e713c
1 parent b012d3a
commit a2e713c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,7 +2,7 @@
   path = MOM6
   url = https://github.com/NCAR/MOM6.git
   fxDONOTUSEurl = https://github.com/NCAR/MOM6.git
-    fxtag = dev/ncar_241017
+    fxtag = dev/ncar_241101
     fxrequired = AlwaysRequired
 
 [submodule "stochastic_physics"]
@@ -16,6 +16,6 @@
   path = externals/MARBL
   url = https://github.com/marbl-ecosys/MARBL.git
   fxDONOTUSEurl = https://github.com/marbl-ecosys/MARBL.git
-    fxtag = marbl0.48.0
+    fxtag = marbl0.48.2
     fxrequired = AlwaysRequired
 
diff --git a/MOM6 b/MOM6
diff --git a/externals/MARBL b/externals/MARBL
+11 −1		config_src/external/MARBL/marbl_interface.F90
+1 −0		config_src/external/MARBL/marbl_interface_public_types.F90
+1 −1		pkg/CVMix-src
+1 −1		src/core/MOM.F90
+41 −9		src/parameterizations/vertical/MOM_CVMix_KPP.F90
+13 −10		src/parameterizations/vertical/MOM_diabatic_driver.F90
+44 −36		src/parameterizations/vertical/MOM_vert_friction.F90
+62 −19		src/tracer/MARBL_tracers.F90
+7 −3		src/tracer/MOM_tracer_hor_diff.F90
+9 −0		MARBL_tools/run_test_suite.sh
+14 −0		src/marbl_interface.F90
+26 −10		src/marbl_interior_tendency_mod.F90
+60 −1		tests/driver_src/marbl.F90
+11 −3		tests/driver_src/marbl_init_drv.F90
+1 −0		tests/input_files/settings/marbl_with_ladjust_bury_coeff.settings
+17 −0		tests/regression_tests/bury_coeff/bury_coeff.py
+3 −0		tests/regression_tests/bury_coeff/test.nml