Skip to content

Commit 7ba98f8

Browse files
mom6botHallberg-NOAA
mom6bot
authored and
Hallberg-NOAA
committed
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
1 parent 49c67d6 commit 7ba98f8

File tree

3 files changed

+1
-97
lines changed

3 files changed

+1
-97
lines changed

‎ocean_only/global_ALE/layer/available_diags.000000

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,6 @@
183183
! long_name: MEKE energy source from the horizontal advection of MEKE
184184
! units: m2 s-3
185185
! cell_methods: xh:mean yh:mean area:mean
186-
"MEKE_src_mom_K4" [Unused]
187-
! modules: {ocean_model,ocean_model_d2}
188-
! long_name: MEKE energy source from the biharmonic of MEKE
189-
! units: m2 s-3
190-
! cell_methods: xh:mean yh:mean area:mean
191186
"MEKE_src_btm_drag" [Unused]
192187
! modules: {ocean_model,ocean_model_d2}
193188
! long_name: MEKE energy source from the bottom drag acting on MEKE
@@ -198,16 +193,6 @@
198193
! long_name: MEKE energy source from the thickness mixing (GM scheme)
199194
! units: m2 s-3
200195
! cell_methods: xh:mean yh:mean area:mean
201-
"MEKE_src_mom_lp" [Unused]
202-
! modules: {ocean_model,ocean_model_d2}
203-
! long_name: MEKE energy source from the Laplacian of resolved flows
204-
! units: m2 s-3
205-
! cell_methods: xh:mean yh:mean area:mean
206-
"MEKE_src_mom_bh" [Unused]
207-
! modules: {ocean_model,ocean_model_d2}
208-
! long_name: MEKE energy source from the biharmonic of resolved flows
209-
! units: m2 s-3
210-
! cell_methods: xh:mean yh:mean area:mean
211196
"MEKE_decay" [Unused]
212197
! modules: {ocean_model,ocean_model_d2}
213198
! long_name: MEKE decay rate
@@ -639,39 +624,6 @@
639624
! units: nondim
640625
! cell_methods: xh:mean yh:mean zl:mean area:mean
641626
! variants: {grid_Re_Ah,grid_Re_Ah_xyave}
642-
"visc_limit_h_flag" [Unused]
643-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
644-
! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at h points
645-
! units: nondim
646-
! cell_methods: xh:mean yh:mean zl:mean area:mean
647-
! variants: {visc_limit_h_flag,visc_limit_h_flag_xyave}
648-
"visc_limit_q_flag" [Unused]
649-
! modules: {ocean_model,ocean_model_d2}
650-
! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at q points
651-
! units: nondim
652-
! cell_methods: xq:point yq:point zl:mean
653-
"visc_limit_h" [Unused]
654-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
655-
! long_name: Value of the biharmonic viscosity limiter at h points
656-
! units: nondim
657-
! cell_methods: xh:mean yh:mean zl:mean area:mean
658-
! variants: {visc_limit_h,visc_limit_h_xyave}
659-
"visc_limit_q" [Unused]
660-
! modules: {ocean_model,ocean_model_d2}
661-
! long_name: Value of the biharmonic viscosity limiter at q points
662-
! units: nondim
663-
! cell_methods: xq:point yq:point zl:mean
664-
"visc_limit_h_frac" [Unused]
665-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
666-
! long_name: Value of the biharmonic viscosity limiter at h points
667-
! units: nondim
668-
! cell_methods: xh:mean yh:mean zl:mean area:mean
669-
! variants: {visc_limit_h_frac,visc_limit_h_frac_xyave}
670-
"visc_limit_q_frac" [Unused]
671-
! modules: {ocean_model,ocean_model_d2}
672-
! long_name: Value of the biharmonic viscosity limiter at q points
673-
! units: nondim
674-
! cell_methods: xq:point yq:point zl:mean
675627
"Khh" [Used] (CMOR equivalent is "difmxylo")
676628
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
677629
! long_name: Laplacian Horizontal Viscosity at h Points

‎ocean_only/global_ALE/z/available_diags.000000

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,6 @@
183183
! long_name: MEKE energy source from the horizontal advection of MEKE
184184
! units: m2 s-3
185185
! cell_methods: xh:mean yh:mean area:mean
186-
"MEKE_src_mom_K4" [Unused]
187-
! modules: {ocean_model,ocean_model_d2}
188-
! long_name: MEKE energy source from the biharmonic of MEKE
189-
! units: m2 s-3
190-
! cell_methods: xh:mean yh:mean area:mean
191186
"MEKE_src_btm_drag" [Unused]
192187
! modules: {ocean_model,ocean_model_d2}
193188
! long_name: MEKE energy source from the bottom drag acting on MEKE
@@ -198,16 +193,6 @@
198193
! long_name: MEKE energy source from the thickness mixing (GM scheme)
199194
! units: m2 s-3
200195
! cell_methods: xh:mean yh:mean area:mean
201-
"MEKE_src_mom_lp" [Unused]
202-
! modules: {ocean_model,ocean_model_d2}
203-
! long_name: MEKE energy source from the Laplacian of resolved flows
204-
! units: m2 s-3
205-
! cell_methods: xh:mean yh:mean area:mean
206-
"MEKE_src_mom_bh" [Unused]
207-
! modules: {ocean_model,ocean_model_d2}
208-
! long_name: MEKE energy source from the biharmonic of resolved flows
209-
! units: m2 s-3
210-
! cell_methods: xh:mean yh:mean area:mean
211196
"MEKE_decay" [Unused]
212197
! modules: {ocean_model,ocean_model_d2}
213198
! long_name: MEKE decay rate
@@ -661,39 +646,6 @@
661646
! units: nondim
662647
! cell_methods: xh:mean yh:mean zl:mean area:mean
663648
! variants: {grid_Re_Ah,grid_Re_Ah_xyave}
664-
"visc_limit_h_flag" [Unused]
665-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
666-
! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at h points
667-
! units: nondim
668-
! cell_methods: xh:mean yh:mean zl:mean area:mean
669-
! variants: {visc_limit_h_flag,visc_limit_h_flag_xyave}
670-
"visc_limit_q_flag" [Unused]
671-
! modules: {ocean_model,ocean_model_d2}
672-
! long_name: Locations where the biharmonic viscosity reached the better_bound limiter at q points
673-
! units: nondim
674-
! cell_methods: xq:point yq:point zl:mean
675-
"visc_limit_h" [Unused]
676-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
677-
! long_name: Value of the biharmonic viscosity limiter at h points
678-
! units: nondim
679-
! cell_methods: xh:mean yh:mean zl:mean area:mean
680-
! variants: {visc_limit_h,visc_limit_h_xyave}
681-
"visc_limit_q" [Unused]
682-
! modules: {ocean_model,ocean_model_d2}
683-
! long_name: Value of the biharmonic viscosity limiter at q points
684-
! units: nondim
685-
! cell_methods: xq:point yq:point zl:mean
686-
"visc_limit_h_frac" [Unused]
687-
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
688-
! long_name: Value of the biharmonic viscosity limiter at h points
689-
! units: nondim
690-
! cell_methods: xh:mean yh:mean zl:mean area:mean
691-
! variants: {visc_limit_h_frac,visc_limit_h_frac_xyave}
692-
"visc_limit_q_frac" [Unused]
693-
! modules: {ocean_model,ocean_model_d2}
694-
! long_name: Value of the biharmonic viscosity limiter at q points
695-
! units: nondim
696-
! cell_methods: xq:point yq:point zl:mean
697649
"Khh" [Used] (CMOR equivalent is "difmxylo")
698650
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
699651
! long_name: Laplacian Horizontal Viscosity at h Points

‎src/MOM6

0 commit comments

Comments
 (0)