MOM6: FMA rotation symmetric form of legacy FrictWork_bh

- NOAA-GFDL/MOM6@c346c73d0 FMA rotation symmetric form of legacy FrictWork_bh MOM6: Revert int_tide_CS to pointer MOM6: Move damping diagnostics outside MEKE loop MOM6: Move flag test outside of FrictWork loop MOM6: Conditionally compute biharmonic FrCoeff MOM6: Split src and src_GM compute loops
NOAA-GFDL · Jan 14, 2025 · 7ba98f8 · 7ba98f8
1 parent 49c67d6
commit 7ba98f8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 97 deletions.
diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000
@@ -183,11 +183,6 @@
     ! long_name: MEKE energy source from the horizontal advection of MEKE
     ! units: m2 s-3
     ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_K4"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the biharmonic of MEKE
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
 "MEKE_src_btm_drag"  [Unused]
     ! modules: {ocean_model,ocean_model_d2}
     ! long_name: MEKE energy source from the bottom drag acting on MEKE
@@ -198,16 +193,6 @@
     ! long_name: MEKE energy source from the thickness mixing (GM scheme)
     ! units: m2 s-3
     ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_lp"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the Laplacian of resolved flows
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_bh"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the biharmonic of resolved flows
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
 "MEKE_decay"  [Unused]
     ! modules: {ocean_model,ocean_model_d2}
     ! long_name: MEKE decay rate
@@ -639,39 +624,6 @@
     ! units: nondim
     ! cell_methods: xh:mean yh:mean zl:mean area:mean
     ! variants: {grid_Re_Ah,grid_Re_Ah_xyave}
-"visc_limit_h_flag"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h_flag,visc_limit_h_flag_xyave}
-"visc_limit_q_flag"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
-"visc_limit_h"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h,visc_limit_h_xyave}
-"visc_limit_q"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
-"visc_limit_h_frac"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h_frac,visc_limit_h_frac_xyave}
-"visc_limit_q_frac"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
 "Khh"  [Used] (CMOR equivalent is "difmxylo")
     ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
     ! long_name: Laplacian Horizontal Viscosity at h Points

diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000
@@ -183,11 +183,6 @@
     ! long_name: MEKE energy source from the horizontal advection of MEKE
     ! units: m2 s-3
     ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_K4"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the biharmonic of MEKE
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
 "MEKE_src_btm_drag"  [Unused]
     ! modules: {ocean_model,ocean_model_d2}
     ! long_name: MEKE energy source from the bottom drag acting on MEKE
@@ -198,16 +193,6 @@
     ! long_name: MEKE energy source from the thickness mixing (GM scheme)
     ! units: m2 s-3
     ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_lp"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the Laplacian of resolved flows
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
-"MEKE_src_mom_bh"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: MEKE energy source from the biharmonic of resolved flows
-    ! units: m2 s-3
-    ! cell_methods: xh:mean yh:mean area:mean
 "MEKE_decay"  [Unused]
     ! modules: {ocean_model,ocean_model_d2}
     ! long_name: MEKE decay rate
@@ -661,39 +646,6 @@
     ! units: nondim
     ! cell_methods: xh:mean yh:mean zl:mean area:mean
     ! variants: {grid_Re_Ah,grid_Re_Ah_xyave}
-"visc_limit_h_flag"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h_flag,visc_limit_h_flag_xyave}
-"visc_limit_q_flag"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
-"visc_limit_h"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h,visc_limit_h_xyave}
-"visc_limit_q"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
-"visc_limit_h_frac"  [Unused]
-    ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at h points
-    ! units: nondim
-    ! cell_methods: xh:mean yh:mean zl:mean area:mean
-    ! variants: {visc_limit_h_frac,visc_limit_h_frac_xyave}
-"visc_limit_q_frac"  [Unused]
-    ! modules: {ocean_model,ocean_model_d2}
-    ! long_name: Value of the biharmonic viscosity limiter at q points
-    ! units: nondim
-    ! cell_methods: xq:point yq:point zl:mean
 "Khh"  [Used] (CMOR equivalent is "difmxylo")
     ! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
     ! long_name: Laplacian Horizontal Viscosity at h Points

diff --git a/src/MOM6 b/src/MOM6
+222 −63		src/parameterizations/lateral/MOM_MEKE.F90
+103 −94		src/parameterizations/lateral/MOM_hor_visc.F90
+1 −1		src/parameterizations/vertical/MOM_set_diffusivity.F90