Merge branch 'dev/master' into dev/gfdl

- NOAA-GFDL/MOM6@27485ef Merge branch 'dev/master' into dev/gfdl
- NOAA-GFDL/MOM6@7698afb Merge branch 'gustavo-marques-dev-master-candidate-2019-06-11' into dev/master
- NOAA-GFDL/MOM6@5c42192 Removes trailing space
- NOAA-GFDL/MOM6@8f96916 Passes optional arg. (BT=CS%barotropic_CSp) in calls to horizontal_viscosity
- NOAA-GFDL/MOM6@47886e3 Changes Barotropic to BT in horizontal_viscosity
- NOAA-GFDL/MOM6@31dfefd Removes Barotropic and thickness_diffuse from MOM_dynamics_unsplit*
- NOAA-GFDL/MOM6@0d1fbff Issue FATAL error if SPLIT=False and USE_GME=True
- NOAA-GFDL/MOM6@1a71a55 Remove thickness_diffuse_CS from horizontal_viscosity
- NOAA-GFDL/MOM6@2a9d421 Set default AH_VEL_SCALE back to zero
- NOAA-GFDL/MOM6@98373e8 Fix hint syntax in MOM_obsolete_param
- NOAA-GFDL/MOM6@89168bf move OMP calls below GME and above the K-loop
- NOAA-GFDL/MOM6@afb07fb Add MEKE_GEOMETRIC_EPSILON
- NOAA-GFDL/MOM6@062e3b0 Obsolete parameter MEKE_VISCOSITY_COEFF
- NOAA-GFDL/MOM6@2ada29a Adds MEKE_VISCOSITY_COEFF_AU and MEKE_VISCOSITY_COEFF_KU into the MEKE documentation
- NOAA-GFDL/MOM6@31dda12 Merge branch 'dev/master' into dev-master-candidate-2019-06-11
- NOAA-GFDL/MOM6@91d0e26 Merge pull request NOAA-GFDL#103 from gustavo-marques/gme_31May2019
- NOAA-GFDL/MOM6@22b6695 Remove trailing space
- NOAA-GFDL/MOM6@a995acf Reverts biharmonic constants to the origial definition
- NOAA-GFDL/MOM6@2d2f83f Changes the way of counting the work
- NOAA-GFDL/MOM6@25ea4dc Changes in MEKE
- NOAA-GFDL/MOM6@f74be3f Deletes code related to GME_Varmix
- NOAA-GFDL/MOM6@f52375b Changes logic of an if statement in calc_slope_functions to avoid change in answers
- NOAA-GFDL/MOM6@b3c0b69 Fixes unregistered diagnostic id
- NOAA-GFDL/MOM6@1388ce7 Removes trailing space
- NOAA-GFDL/MOM6@4dd50c1 Fixes additional doxygen syntax
- NOAA-GFDL/MOM6@3d997ee Fixes doxygen syntax
- NOAA-GFDL/MOM6@35eccc0 Ensures that MEKE%Kh_diff is only used when USE_KH_IN_MEKE = True
- NOAA-GFDL/MOM6@3594d53 Merge branch 'merge_GME_17May2019' into geometric_putao
- NOAA-GFDL/MOM6@59944eb Added GEOMETRIC as an option for MEKE. Also added biharmonic MEKE viscosity and the option to use a non-MEKE thickness diffusivity to diffuse MEKE. Split MEKE viscosity options into parts concerning Ku and Au.
- NOAA-GFDL/MOM6@03386c0 Merge branch 'dev/ncar' into merge_GME
- NOAA-GFDL/MOM6@e5a0b82 Merge branch 'GME_10may2019putao' into geometric_putao
- NOAA-GFDL/MOM6@e0a8b9b Merge pull request NOAA-GFDL#102 from NCAR/ocn_lag
- NOAA-GFDL/MOM6@b2ff365 fix ocean lag logic for restart runs
- NOAA-GFDL/MOM6@8797615 Merge pull request NOAA-GFDL#101 from NCAR/ocn_lag
- NOAA-GFDL/MOM6@0ae751e apply ocean lag to cesm runs only
- NOAA-GFDL/MOM6@eb301fe skip first tstep and double second tstep
- NOAA-GFDL/MOM6@b668abf Merge pull request NOAA-GFDL#100 from gustavo-marques/set_fw_bug_to_false
- NOAA-GFDL/MOM6@d449d37 Set default of USE_NET_FW_ADJUSTMENT_SIGN_BUG to false in NUOPC cap
- NOAA-GFDL/MOM6@eda43c4 Merge branch 'guillermo_putao' into gme_06may2019
- NOAA-GFDL/MOM6@4c15159 Added a "next-to_boundary" mask that should help with fixing abnormally large values of the velocity gradient tensor magnitude next to land.
- NOAA-GFDL/MOM6@434ffe7 Working configuration of MEKE/GME. Has biharmonic MEKE viscosity and a GME sink term.
- NOAA-GFDL/MOM6@b503858 Merge pull request NOAA-GFDL#99 from gustavo-marques/add_missing_fluxes_nuopc
- NOAA-GFDL/MOM6@ef0abe6 Merge branch 'dev/ncar' into gme_03may2019
- NOAA-GFDL/MOM6@434ff08 Willy was silly.
- NOAA-GFDL/MOM6@27bc6b3 Merge pull request NOAA-GFDL#98 from NCAR/fix_nuopc_calendar
- NOAA-GFDL/MOM6@4b6ef52 Revert "Added biharmonic option for MEKE viscosity."
- NOAA-GFDL/MOM6@7671d31 get calendar from CESM
- NOAA-GFDL/MOM6@69c21ea Add missing US entries and fix typos introduced during merge
- NOAA-GFDL/MOM6@4db5f4d Merge branch 'add_missing_fluxes_nuopc' into gme_03may2019
- NOAA-GFDL/MOM6@4d02387 Add seaice_melt and seaice_melt_heat
- NOAA-GFDL/MOM6@a6cd3fe Commented out thickness diffusivity calls for GME, since it is not presently being used.
- NOAA-GFDL/MOM6@80c65c7 Added a GME sink term to the MEKE budget. Cleaned up MOM_hor_visc.F90.
- NOAA-GFDL/MOM6@6b32174 Added biharmonic option for MEKE viscosity.
- NOAA-GFDL/MOM6@73e89ec Cleaned up MOM_hor_visc.F90 a bit, especially parts having to do with calculating FrictWork.
- NOAA-GFDL/MOM6@3c91971 Added option to calculate MKE-to-MEKE energy conversion by GME.
- NOAA-GFDL/MOM6@f6d1c65 Fixed if statement in MOM_MEKE.F90.  Added option to use alternative form of GM PE-to_MEKE energy conversion in MOM_thickness_diffuse.
- NOAA-GFDL/MOM6@c24bfb3 Added Jansen et al. (2015) version of MEKE dissipation. Added an alternative way of calculating PE-to_MEKE energy conversion.
- NOAA-GFDL/MOM6@3df6ff3 Merge pull request NOAA-GFDL#97 from alperaltuntas/fix_nuopc_use_only
- NOAA-GFDL/MOM6@0fcc576 use ESMF operators
- NOAA-GFDL/MOM6@36ba339 Merge pull request NOAA-GFDL#96 from gustavo-marques/add_missing_US_arguments_nuopc_cap
- NOAA-GFDL/MOM6@ce5571f Add CS%US argument lost during merge conflict
- NOAA-GFDL/MOM6@4727f20 Merge branch 'dev-master-candidate-2018-04-22' into add_missing_US_arguments_nuopc_cap
- NOAA-GFDL/MOM6@42582a1 Merge pull request NOAA-GFDL#95 from alperaltuntas/fix_debug_mode
- NOAA-GFDL/MOM6@03a5586 Merge branch 'dev/ncar' into fix_debug_mode
- NOAA-GFDL/MOM6@d8b7825 fix uninitialized oneOrTwo
- NOAA-GFDL/MOM6@379e9ee make uppercase DEBUG lowercase
- NOAA-GFDL/MOM6@acb4d3f Merge pull request NOAA-GFDL#94 from gustavo-marques/merge-dev-master-candidate-2018-04-22
- NOAA-GFDL/MOM6@d892664 Merge branch 'dev-master-candidate-2018-04-22' into merge-dev-master-candidate-2018-04-22
- NOAA-GFDL/MOM6@5868144 Merge pull request NOAA-GFDL#93 from gustavo-marques/add_nuopc_cap
- NOAA-GFDL/MOM6@172ae02 Fixed problems with FrictWorkMax and FrictWorkDiss in MOM_hor_visc.F. More specifically, I moved the calculation of dudx and dvdy outside of the Leith loop so now it is being calculated with sh_xx.
- NOAA-GFDL/MOM6@8df6efd Added a new flag to MOM_lateral_mixing_coeffs called "USE_VISBECK", which calculates the GM coefficient using the Visbeck et al. (1997) formulation. Previously this was being done whenever VarMix was enabled, but I wanted to separate VarMix from this diffusivity call.
- NOAA-GFDL/MOM6@e5238f5 Merge branch 'dev/ncar' into add_nuopc_cap
- NOAA-GFDL/MOM6@6542122 Added new variable FrictWork_diss to account for the energy dissipated by shear production (excluding the energy diffusion term which can be positive).
- NOAA-GFDL/MOM6@2260e70 Fixed some coding mistakes from the last commit.
- NOAA-GFDL/MOM6@f5da24d Allocated FrictWorkMax array (forgot last time).
- NOAA-GFDL/MOM6@59aad4f Added a loop to ensure MEKE is never less than 0.  Added new variable called FrictWorkMax that calculates the maximum frictional work that is allowed by theory.
- NOAA-GFDL/MOM6@807072b Refactored MOM_hor_visc. Moved GME out of loops where downgradient viscosity is calculated. Moved calculation of FrictWork ahead of GME so I can separate the work done by downgradient stuff from that of GME.
- NOAA-GFDL/MOM6@bd98d83 Increased GME limiter and number of times to pass through smoothing function.
- NOAA-GFDL/MOM6@fda0334 Fixed QG Leith halo problem on k=nz level. Also added a tapering function to GME that turns it off in shallow water.
- NOAA-GFDL/MOM6@24790c2 Added some pass_vector and pass_var calls
- NOAA-GFDL/MOM6@a605c59 Added some pass_vector calls
- NOAA-GFDL/MOM6@a271bb9 Changed QG Leith limiter to 2D vort. grad.
- NOAA-GFDL/MOM6@823d014 Merge branch 'dev/ncar' into GME_21Feb2019
- NOAA-GFDL/MOM6@bed3fbc Change limiter in the GME_coeff to 1.0e4
- NOAA-GFDL/MOM6@25ff7c8 Merge pull request NOAA-GFDL#92 from gustavo-marques/fix_rotation
- NOAA-GFDL/MOM6@8f2080a Merge pull request NOAA-GFDL#91 from gustavo-marques/latent_heat_frozen_fluxes
- NOAA-GFDL/MOM6@a160252 Change limiter in the GME_coeff to 1.0e5
- NOAA-GFDL/MOM6@dddf151 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation
- NOAA-GFDL/MOM6@e502a97 Fix another line length
- NOAA-GFDL/MOM6@12d8856 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation
- NOAA-GFDL/MOM6@adfd67e Fix line length
- NOAA-GFDL/MOM6@2467749 Merge branch 'dev/ncar' into latent_heat_frozen_fluxes
- NOAA-GFDL/MOM6@a5fe8c0 Fix rotations in import and export subroutines
- NOAA-GFDL/MOM6@72945e4 Comment lines with index_bounds
- NOAA-GFDL/MOM6@1241da8 Add new way of calculating latent heat
- NOAA-GFDL/MOM6@b97a787 Fixed problem with updating hq -- hq is now a 2D array
- NOAA-GFDL/MOM6@5360863 Changed hq to a 2D array
- NOAA-GFDL/MOM6@4b35452 Modified initialization of GME variables
- NOAA-GFDL/MOM6@38ac453 Fixed several issues for GME
- NOAA-GFDL/MOM6@03b01c4 Merge pull request NOAA-GFDL#89 from gustavo-marques/sync_dev_master_19Dec18
- NOAA-GFDL/MOM6@8228b64 Merge pull request NOAA-GFDL#90 from alperaltuntas/fix_oda
- NOAA-GFDL/MOM6@cc7f725 apply oda tracer increments only if da is active
- NOAA-GFDL/MOM6@de3a52c Deleted KH_t_GME and allocate arrays via safe_alloc_ptr
- NOAA-GFDL/MOM6@581b30d Move inv_PI3 outside of k loop
- NOAA-GFDL/MOM6@462dfd8 Change condition for applying Ah_Limit + axes for GME diag.
- NOAA-GFDL/MOM6@bef613b Add thickness_diffuse_CSp and Barotropic_CSp as arguments
- NOAA-GFDL/MOM6@e8a7386 Move thickness_diffuse_init before initialize_dyn_split_RK2
- NOAA-GFDL/MOM6@d3aaa9d Fix calls to find_eta and calc_Visbeck_coeffs
- NOAA-GFDL/MOM6@019ee95 Merge branch 'dev/ncar' into ncar_GME_willy_merged
- NOAA-GFDL/MOM6@d5f5d32 Adds GME and smoothing function
- NOAA-GFDL/MOM6@a38fc07 Add flags for GME and define necessary arrays
- NOAA-GFDL/MOM6@ec68e41 Adds infrastructure to enable GME to access private arrays
- NOAA-GFDL/MOM6@60d493a Add option to use QG Leith viscosity as the GM coefficient
- NOAA-GFDL/MOM6@81a5771 Compute QG Leith GM coefficient and add some diagnostics
- NOAA-GFDL/MOM6@c42b6a4 Add grad_vort_mag_h and grad_vort_mag_q
- NOAA-GFDL/MOM6@d96a3fe Defined KH arrays in VarMix to be passed to thickness_diffuse.
- NOAA-GFDL/MOM6@f913004 Preparing lateral_coeffs and thickness_diffuse for QG Leith calculations.
- NOAA-GFDL/MOM6@52667e9 Changed use_QG_Leith to use_QG_Leith_visc. Removed commented lines from calc_QG_Leith_viscosity.
- NOAA-GFDL/MOM6@e0baaea Initialized new arrays for Leith, deleted deprecated ones
- NOAA-GFDL/MOM6@3b43efe Refactored the entire Leith section.
- NOAA-GFDL/MOM6@f4256fb Adding a limiter via planetary number
- NOAA-GFDL/MOM6@5c5533b Rename variables to make names consistent; fix dimens. Biharm Smag
- NOAA-GFDL/MOM6@b9d69b7 Fix a bug in an if statement
- NOAA-GFDL/MOM6@d069e51 Changed constraint on Leith viscosity.
- NOAA-GFDL/MOM6@92e2875 Bounds vort_xy_* in Leith.
- NOAA-GFDL/MOM6@d02fd47 Adds option to diagnose div_xx_h and vort_xy_q
- NOAA-GFDL/MOM6@da862b3 Change calc_Leith_viscosity to calc_QG_Leith_viscosity
- NOAA-GFDL/MOM6@84542af QG Leith code refactoring
- NOAA-GFDL/MOM6@cda9edd Deletes unneeded code
- NOAA-GFDL/MOM6@7746539 Deletes unecessary code and adds Leith_Kh_*
- NOAA-GFDL/MOM6@2becf74 Merge branch 'qg-leith' into ncar_qg_leith
- NOAA-GFDL/MOM6@69f2c75 Added stretching term for QG Leith viscosity
- NOAA-GFDL/MOM6@f08592f Added independent flag for beta-term in Leith
- NOAA-GFDL/MOM6@b39edff Cleaned up left over arrays from moving Leith out of MOM_hor_visc.F90
- NOAA-GFDL/MOM6@c546d3d Replaced calc_vert_vort_mag() with calc_Leith_viscosity()
- NOAA-GFDL/MOM6@c59f87e Read Leith parameters in MOM_lateral_coeffs.F90
- NOAA-GFDL/MOM6@7dc2510 Added beta to Leith vorticity magnitude
- NOAA-GFDL/MOM6@273745c Moved Leith vorticity magnitude calc into MOM_lateral_mixing_coeffs.F90
- NOAA-GFDL/MOM6@e5d4bdf Consolidated Leith related calculations
- NOAA-GFDL/MOM6@fd4faf5 Converted local scalar Vort_mag into local 2d array

coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_input

@@ -224,6 +224,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! not used.  If KHTR_SLOPE_CFF>0 or  KhTh_Slope_Cff>0,
                                 ! this is set to true regardless of what is in the
                                 ! parameter file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away
                                 ! when the first baroclinic deformation radius is well

coupled_AM2_LM3_SIS/CM2G63L/MOM_input

@@ -209,6 +209,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! not used.  If KHTR_SLOPE_CFF>0 or  KhTh_Slope_Cff>0,
                                 ! this is set to true regardless of what is in the
                                 ! parameter file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away
                                 ! when the first baroclinic deformation radius is well

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all

@@ -527,6 +527,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! be created even if the scheme is not used.  If KHTR_SLOPE_CFF>0 or
                                 ! KhTh_Slope_Cff>0, this is set to true regardless of what is in the parameter
                                 ! file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -591,6 +594,8 @@ GILL_EQUATORIAL_LD = False      !   [Boolean] default = False
                                 ! radius, otherwise, if false, use Pedlosky's definition. These definitions
                                 ! differ by a factor of 2 in front of the beta term in the denominator. Gill's
                                 ! is the more appropriate definition.
+USE_QG_LEITH_GM = False         !   [Boolean] default = False
+                                ! If true, use the QG Leith viscosity as the GM coefficient.
 
 ! === module MOM_set_visc ===
 BOTTOMDRAGLAW = True            !   [Boolean] default = True
@@ -668,6 +673,43 @@ SMAG_CONST_CHANNEL = 0.15       !   [nondim] default = 0.15
                                 ! channel drag if it is enabled.  The default is to use the same value as
                                 ! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
                                 ! 0.15 if the specified value is negative.
+
+! === module MOM_thickness_diffuse ===
+KHTH = 10.0                     !   [m2 s-1] default = 0.0
+                                ! The background horizontal thickness diffusivity.
+KHTH_MIN = 0.0                  !   [m2 s-1] default = 0.0
+                                ! The minimum horizontal thickness diffusivity.
+KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
+                                ! The maximum horizontal thickness diffusivity.
+KHTH_MAX_CFL = 0.8              !   [nondimensional] default = 0.8
+                                ! The maximum value of the local diffusive CFL ratio that is permitted for the
+                                ! thickness diffusivity. 1.0 is the marginally unstable value in a pure layered
+                                ! model, but much smaller numbers (e.g. 0.1) seem to work better for ALE-based
+                                ! models.
+DETANGLE_INTERFACES = False     !   [Boolean] default = False
+                                ! If defined add 3-d structured enhanced interface height diffusivities to
+                                ! horizontally smooth jagged layers.
+KHTH_SLOPE_MAX = 0.01           !   [nondim] default = 0.01
+                                ! A slope beyond which the calculated isopycnal slope is not reliable and is
+                                ! scaled away.
+KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
+                                ! A diapycnal diffusivity that is used to interpolate more sensible values of T
+                                ! & S into thin layers.
+KHTH_USE_FGNV_STREAMFUNCTION = False !   [Boolean] default = False
+                                ! If true, use the streamfunction formulation of Ferrari et al., 2010, which
+                                ! effectively emphasizes graver vertical modes by smoothing in the vertical.
+MEKE_GM_SRC_ALT = False         !   [Boolean] default = False
+                                ! If true, use the GM energy conversion form S^2*N^2*kappa rather
+                                ! than the streamfunction for the GM source term.
+MEKE_GEOMETRIC = False          !   [Boolean] default = False
+                                ! If true, uses the GM coefficient formulation
+                                ! from the GEOMETRIC framework (Marshall et al., 2012).
+USE_KH_IN_MEKE = False          !   [Boolean] default = False
+                                ! If true, uses the thickness diffusivity calculated here to diffuse
+                                ! MEKE.
+USE_GME = False                 !   [Boolean] default = False
+                                ! If true, use the GM+E backscatter scheme in association
+                                ! with the Gent and McWilliams parameterization.
 TIDES = False                   !   [Boolean] default = False
                                 ! If true, apply tidal momentum forcing.
 BE = 0.6                        !   [nondim] default = 0.6
@@ -1010,31 +1052,6 @@ BT_USE_OLD_CORIOLIS_BRACKET_BUG = False !   [Boolean] default = False
                                 ! If True, use an order of operations that is not bitwise rotationally symmetric
                                 ! in the meridional Coriolis term of the barotropic solver.
 
-! === module MOM_thickness_diffuse ===
-KHTH = 10.0                     !   [m2 s-1] default = 0.0
-                                ! The background horizontal thickness diffusivity.
-KHTH_MIN = 0.0                  !   [m2 s-1] default = 0.0
-                                ! The minimum horizontal thickness diffusivity.
-KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
-                                ! The maximum horizontal thickness diffusivity.
-KHTH_MAX_CFL = 0.8              !   [nondimensional] default = 0.8
-                                ! The maximum value of the local diffusive CFL ratio that is permitted for the
-                                ! thickness diffusivity. 1.0 is the marginally unstable value in a pure layered
-                                ! model, but much smaller numbers (e.g. 0.1) seem to work better for ALE-based
-                                ! models.
-DETANGLE_INTERFACES = False     !   [Boolean] default = False
-                                ! If defined add 3-d structured enhanced interface height diffusivities to
-                                ! horizontally smooth jagged layers.
-KHTH_SLOPE_MAX = 0.01           !   [nondim] default = 0.01
-                                ! A slope beyond which the calculated isopycnal slope is not reliable and is
-                                ! scaled away.
-KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
-                                ! A diapycnal diffusivity that is used to interpolate more sensible values of T
-                                ! & S into thin layers.
-KHTH_USE_FGNV_STREAMFUNCTION = False !   [Boolean] default = False
-                                ! If true, use the streamfunction formulation of Ferrari et al., 2010, which
-                                ! effectively emphasizes graver vertical modes by smoothing in the vertical.
-
 ! === module MOM_mixed_layer_restrat ===
 MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
                                 ! If true, a density-gradient dependent re-stratifying flow is imposed in the

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short

@@ -186,6 +186,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! be created even if the scheme is not used.  If KHTR_SLOPE_CFF>0 or
                                 ! KhTh_Slope_Cff>0, this is set to true regardless of what is in the parameter
                                 ! file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -239,6 +242,12 @@ KV_BBL_MIN = 0.0                !   [m2 s-1] default = 1.0E-04
 KV_TBL_MIN = 0.0                !   [m2 s-1] default = 1.0E-04
                                 ! The minimum viscosities in the top boundary layer.
 
+! === module MOM_thickness_diffuse ===
+KHTH = 10.0                     !   [m2 s-1] default = 0.0
+                                ! The background horizontal thickness diffusivity.
+KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
+                                ! The maximum horizontal thickness diffusivity.
+
 ! === module MOM_continuity ===
 
 ! === module MOM_continuity_PPM ===
@@ -319,12 +328,6 @@ DTBT = 60.0                     !   [s or nondim] default = -0.98
                                 ! DTBT to 0 is the same as setting it to -0.98. The value of DTBT that will
                                 ! actually be used is an integer fraction of DT, rounding down.
 
-! === module MOM_thickness_diffuse ===
-KHTH = 10.0                     !   [m2 s-1] default = 0.0
-                                ! The background horizontal thickness diffusivity.
-KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
-                                ! The maximum horizontal thickness diffusivity.
-
 ! === module MOM_mixed_layer_restrat ===
 MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
                                 ! If true, a density-gradient dependent re-stratifying flow is imposed in the

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_input

@@ -225,6 +225,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! not used.  If KHTR_SLOPE_CFF>0 or  KhTh_Slope_Cff>0,
                                 ! this is set to true regardless of what is in the
                                 ! parameter file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away
                                 ! when the first baroclinic deformation radius is well

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all

@@ -527,6 +527,9 @@ USE_VARIABLE_MIXING = True      !   [Boolean] default = False
                                 ! be created even if the scheme is not used.  If KHTR_SLOPE_CFF>0 or
                                 ! KhTh_Slope_Cff>0, this is set to true regardless of what is in the parameter
                                 ! file.
+USE_VISBECK = True              !   [Boolean] default = False
+                                ! If true, use the Visbeck et al. (1997) formulation for
+                                ! thickness diffusivity.
 RESOLN_SCALED_KH = True         !   [Boolean] default = False
                                 ! If true, the Laplacian lateral viscosity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -591,6 +594,8 @@ GILL_EQUATORIAL_LD = False      !   [Boolean] default = False
                                 ! radius, otherwise, if false, use Pedlosky's definition. These definitions
                                 ! differ by a factor of 2 in front of the beta term in the denominator. Gill's
                                 ! is the more appropriate definition.
+USE_QG_LEITH_GM = False         !   [Boolean] default = False
+                                ! If true, use the QG Leith viscosity as the GM coefficient.
 
 ! === module MOM_set_visc ===
 BOTTOMDRAGLAW = True            !   [Boolean] default = True
@@ -668,6 +673,43 @@ SMAG_CONST_CHANNEL = 0.15       !   [nondim] default = 0.15
                                 ! channel drag if it is enabled.  The default is to use the same value as
                                 ! SMAG_LAP_CONST if it is defined, or 0.15 if it is not. The value used is also
                                 ! 0.15 if the specified value is negative.
+
+! === module MOM_thickness_diffuse ===
+KHTH = 10.0                     !   [m2 s-1] default = 0.0
+                                ! The background horizontal thickness diffusivity.
+KHTH_MIN = 0.0                  !   [m2 s-1] default = 0.0
+                                ! The minimum horizontal thickness diffusivity.
+KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
+                                ! The maximum horizontal thickness diffusivity.
+KHTH_MAX_CFL = 0.8              !   [nondimensional] default = 0.8
+                                ! The maximum value of the local diffusive CFL ratio that is permitted for the
+                                ! thickness diffusivity. 1.0 is the marginally unstable value in a pure layered
+                                ! model, but much smaller numbers (e.g. 0.1) seem to work better for ALE-based
+                                ! models.
+DETANGLE_INTERFACES = False     !   [Boolean] default = False
+                                ! If defined add 3-d structured enhanced interface height diffusivities to
+                                ! horizontally smooth jagged layers.
+KHTH_SLOPE_MAX = 0.01           !   [nondim] default = 0.01
+                                ! A slope beyond which the calculated isopycnal slope is not reliable and is
+                                ! scaled away.
+KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
+                                ! A diapycnal diffusivity that is used to interpolate more sensible values of T
+                                ! & S into thin layers.
+KHTH_USE_FGNV_STREAMFUNCTION = False !   [Boolean] default = False
+                                ! If true, use the streamfunction formulation of Ferrari et al., 2010, which
+                                ! effectively emphasizes graver vertical modes by smoothing in the vertical.
+MEKE_GM_SRC_ALT = False         !   [Boolean] default = False
+                                ! If true, use the GM energy conversion form S^2*N^2*kappa rather
+                                ! than the streamfunction for the GM source term.
+MEKE_GEOMETRIC = False          !   [Boolean] default = False
+                                ! If true, uses the GM coefficient formulation
+                                ! from the GEOMETRIC framework (Marshall et al., 2012).
+USE_KH_IN_MEKE = False          !   [Boolean] default = False
+                                ! If true, uses the thickness diffusivity calculated here to diffuse
+                                ! MEKE.
+USE_GME = False                 !   [Boolean] default = False
+                                ! If true, use the GM+E backscatter scheme in association
+                                ! with the Gent and McWilliams parameterization.
 TIDES = False                   !   [Boolean] default = False
                                 ! If true, apply tidal momentum forcing.
 BE = 0.6                        !   [nondim] default = 0.6
@@ -1006,31 +1048,6 @@ BT_USE_OLD_CORIOLIS_BRACKET_BUG = False !   [Boolean] default = False
                                 ! If True, use an order of operations that is not bitwise rotationally symmetric
                                 ! in the meridional Coriolis term of the barotropic solver.
 
-! === module MOM_thickness_diffuse ===
-KHTH = 10.0                     !   [m2 s-1] default = 0.0
-                                ! The background horizontal thickness diffusivity.
-KHTH_MIN = 0.0                  !   [m2 s-1] default = 0.0
-                                ! The minimum horizontal thickness diffusivity.
-KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
-                                ! The maximum horizontal thickness diffusivity.
-KHTH_MAX_CFL = 0.8              !   [nondimensional] default = 0.8
-                                ! The maximum value of the local diffusive CFL ratio that is permitted for the
-                                ! thickness diffusivity. 1.0 is the marginally unstable value in a pure layered
-                                ! model, but much smaller numbers (e.g. 0.1) seem to work better for ALE-based
-                                ! models.
-DETANGLE_INTERFACES = False     !   [Boolean] default = False
-                                ! If defined add 3-d structured enhanced interface height diffusivities to
-                                ! horizontally smooth jagged layers.
-KHTH_SLOPE_MAX = 0.01           !   [nondim] default = 0.01
-                                ! A slope beyond which the calculated isopycnal slope is not reliable and is
-                                ! scaled away.
-KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
-                                ! A diapycnal diffusivity that is used to interpolate more sensible values of T
-                                ! & S into thin layers.
-KHTH_USE_FGNV_STREAMFUNCTION = False !   [Boolean] default = False
-                                ! If true, use the streamfunction formulation of Ferrari et al., 2010, which
-                                ! effectively emphasizes graver vertical modes by smoothing in the vertical.
-
 ! === module MOM_mixed_layer_restrat ===
 MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
                                 ! If true, a density-gradient dependent re-stratifying flow is imposed in the