MOM6: Merge branch 'gustavo-marques-dev-master-candidate-ncar-2020-03…

…-27' into dev/master

- Update of MOM6 from NCAR/MOM6

- NOAA-GFDL/MOM6@010492e Merge branch 'gustavo-marques-dev-master-candidate-ncar-2020-03-27' into dev/master
- NOAA-GFDL/MOM6@e73db38 Merge branch 'dev-master-candidate-ncar-2020-03-27' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-dev-master-candidate-ncar-2020-03-27
- NOAA-GFDL/MOM6@6ce3dd9 Change CDRAG_MEKE to MEKE_CDRAG
- NOAA-GFDL/MOM6@0cddf1f Merge pull request #146 from NCAR/fix_tracer_advect_omp
- NOAA-GFDL/MOM6@8025fd4 refactor advect_x and advect_y calls
- NOAA-GFDL/MOM6@3768a11 make advect_y thread-safe
- NOAA-GFDL/MOM6@3d05d85 make T_adx_2d diagnostics thread-safe
- NOAA-GFDL/MOM6@6636e0f fix OMP directive variable list
- NOAA-GFDL/MOM6@afe0335 Merge pull request #144 from gustavo-marques/merge_GME_outside_MEKE
- NOAA-GFDL/MOM6@1f308a0 Extend loop indices and add calls to pass_vector
- NOAA-GFDL/MOM6@1ecade5 Updates GME by removing dependency on MEKE
- NOAA-GFDL/MOM6@c012019 Merge pull request #143 from gustavo-marques/fix_vhGM_GEOMETRIC
- NOAA-GFDL/MOM6@c429824 Fix a bug in the vmGM field when using GEOMETRIC
- NOAA-GFDL/MOM6@0eb0615 Merge pull request #142 from NCAR/omp_fixes
- NOAA-GFDL/MOM6@f832925 initialize fluid entrainment arrays
- NOAA-GFDL/MOM6@276c6b4 call chksum for drag_vel if its allocated
- NOAA-GFDL/MOM6@4478066 uncomment omp do block in advect_tracer
- NOAA-GFDL/MOM6@7533454 fix omp in calculate_diagnostic_fields
- NOAA-GFDL/MOM6@21918b4 comment out OMP directives in KPP_compute_BLD temporarily
- NOAA-GFDL/MOM6@049abb0 fix omp directives in set_viscous_BBL
- NOAA-GFDL/MOM6@67e5481 fix omp directive for melt_potential
- NOAA-GFDL/MOM6@46b1f34 correct namespace name for doxygen
- NOAA-GFDL/MOM6@83da090 Merge pull request #141 from alperaltuntas/fix_gnu_bugs
- NOAA-GFDL/MOM6@ba5a442 if not allocated, do not assign R_rho
- NOAA-GFDL/MOM6@435a741 Close param file before it gets opened by ocean_model_init again.
- NOAA-GFDL/MOM6@ab54b96 Merge pull request #140 from alperaltuntas/fix_omp2
- NOAA-GFDL/MOM6@a9c896e set CS%MEKE_equilibrium_restoring, to false by default
- NOAA-GFDL/MOM6@3540446 fix unitialized logical var in MOM_MEKE
- NOAA-GFDL/MOM6@63cf741 fix kpp omp directives
- NOAA-GFDL/MOM6@22f0242 Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar
- NOAA-GFDL/MOM6@1ed6b94 Merge pull request #139 from gustavo-marques/update_LBD
- NOAA-GFDL/MOM6@9db5ba1 Improve documentation and unit tests
- NOAA-GFDL/MOM6@0525a4c Change flux limiting calculation
- NOAA-GFDL/MOM6@248a87c Fix units description and delete placeholder for the pressure reconstruction
- NOAA-GFDL/MOM6@c8361e7 Add a note saying khtr_avg should be computed once khtr is 3D
- NOAA-GFDL/MOM6@dce59f4 Fix a bug in the LBD method 2
- NOAA-GFDL/MOM6@5c8b32f Fix a bug when checking if hbl > htot
- NOAA-GFDL/MOM6@408bd2f Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into near_surface_fluxes
- NOAA-GFDL/MOM6@31d2941 Fix bug in boundary_k_range if hbl > htot
- NOAA-GFDL/MOM6@4fe0191 Compute tracer tendency due to lateral diffusion
- NOAA-GFDL/MOM6@e2bafc5 fix omp directives in MOM_thickness_diffuse
- NOAA-GFDL/MOM6@1ae069b Merge branch 'dev/ncar' into near_surface_fluxes
- NOAA-GFDL/MOM6@44d36c4 Merge pull request #138 from gustavo-marques/fix_ocean_model_data_get
- NOAA-GFDL/MOM6@1d1914f Merge pull request #136 from gustavo-marques/merge-dev-master-candidate-2019-12-17
- NOAA-GFDL/MOM6@0188f35 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17
- NOAA-GFDL/MOM6@f7debed Delete ocean_model_data_get from MCT and NUOPC caps
- NOAA-GFDL/MOM6@a12abd6 Revert "Merge pull request #133 from gustavo-marques/clean_caps"
- NOAA-GFDL/MOM6@c7c7bf1 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17
- NOAA-GFDL/MOM6@c358114 Merge pull request #135 from gustavo-marques/LBD_merge
- NOAA-GFDL/MOM6@d276f3f Merge branch 'dev/ncar' into near_surface_fluxes
- NOAA-GFDL/MOM6@8a3e3e7 Merge branch 'near_surface_fluxes' into LBD_merge
- NOAA-GFDL/MOM6@2cccc83 Merge pull request #134 from gustavo-marques/fix_leith
- NOAA-GFDL/MOM6@3d17e03 Merge pull request #133 from gustavo-marques/clean_caps
- NOAA-GFDL/MOM6@e538144 remove duplicate fld_list_add calls
- NOAA-GFDL/MOM6@2c7de66 Merge pull request #132 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@78bb4c1 Delete quotes from doxygen comment
- NOAA-GFDL/MOM6@8c95cc0 Fix bugs in Leith add new input parameter
- NOAA-GFDL/MOM6@c50a978 Toggle continuous neutral diffusion in interior only
- NOAA-GFDL/MOM6@89eaede Delete ocean_model_data_get* from all the caps
- NOAA-GFDL/MOM6@20d076b Modify continuous neutral diffusion to account for boundary layer
- NOAA-GFDL/MOM6@a2d9636 Merge pull request #131 from gustavo-marques/meke_khtr
- NOAA-GFDL/MOM6@cb79e97 add changes from old MOM6 repo in cmeps_integration branch that were (#10)
- NOAA-GFDL/MOM6@97d07bc Set the default for CDRAG_MEKE to CDRAG
- NOAA-GFDL/MOM6@02c986a Set default value to 0.003
- NOAA-GFDL/MOM6@e71a573 Fix doxygen references
- NOAA-GFDL/MOM6@9303e99 Fix typos and bugs
- NOAA-GFDL/MOM6@f3dba16 Add new option to avoid negative thicknesses
- NOAA-GFDL/MOM6@7135281 Merge pull request #8 from DeniseWorthen/feature/runoff_optional
- NOAA-GFDL/MOM6@147f7a3 Merge pull request #130 from DeniseWorthen/feature/runoff_optional
- NOAA-GFDL/MOM6@2c6bdf9 Create a separate param for MEKE bottom drag (CDRAG_MEKE)
- NOAA-GFDL/MOM6@b66eafe backs out change in standard name for liquid and frozen heat flux since this will require a change in the nuopc field_dictionary. The fields are not currently used.
- NOAA-GFDL/MOM6@b1ce184 Documentation and minor improvements
- NOAA-GFDL/MOM6@0a89aac Fix registry of lbd diagnostics
- NOAA-GFDL/MOM6@6bce8ab Clean the code and fix line length exceeding 120
- NOAA-GFDL/MOM6@7f2b93e Replace lbm to lbd (lateral boundary diffusion)
- NOAA-GFDL/MOM6@64be85f minor text changes; uncomment runoff heat flux terms; required change made in feature/runoff_names branch of NEMS
- NOAA-GFDL/MOM6@419a021 removes data_override and associated calls from mom_cap renames: iob%rofl_flux => iob%lrunoff iob%rofi_flux => iob%frunoff iob%runoff_hflx = > iob%lrunoff_hflx iob%calving_hflx => iob%frunoff_hflx makes changes in mom_cap_methods and mom_surface_forcing_nuopc consistent w/ new iob names temporarily comments out _hflx terms in mom_cap,mom_cap_methods adds flag in mom_surface_forcing_nuopc for adding liquid river runoff via data_override
- NOAA-GFDL/MOM6@ba6140c Merge pull request #1 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@9a6f7f6 Merge NOAA-GFDL dev/master from 20191107
- NOAA-GFDL/MOM6@07481e4 updating mom_cap to add data override which was deleted in merge
- NOAA-GFDL/MOM6@100e92d Merge remote-tracking branch 'GFDL/dev/master' into testnewdevmaster20191107
- NOAA-GFDL/MOM6@80743e6 Adding river runoff (from Jiande) Squashed commit of the following:
- NOAA-GFDL/MOM6@462768b Merge pull request #128 from gustavo-marques/fix_MEKE_GM_src
- NOAA-GFDL/MOM6@050aa31 Moves allocation of CS%equilibrium_value inside subroutine MEKE_equilibrium_restoring
- NOAA-GFDL/MOM6@3f041d9 MEKE diagnostic array fixes
- NOAA-GFDL/MOM6@2bb321e Merge pull request #127 from gustavo-marques/depth_scaled_khth
- NOAA-GFDL/MOM6@ebf5ee0 Adds MEKE_equilibrium_restoring
- NOAA-GFDL/MOM6@1522ad0 Minor changes in the doxygen comments
- NOAA-GFDL/MOM6@223037c Deletes unneeded variables from calc_depth_function
- NOAA-GFDL/MOM6@67016eb Reverts description in DO_DYNAMICS to older version as this was changed by mistake.
- NOAA-GFDL/MOM6@bb785a8 Adds option to scale KHTH with depth
- NOAA-GFDL/MOM6@839217d Rearranged MEKE_EQUILIBRIUM subroutine
- NOAA-GFDL/MOM6@486da1d Replaces trunit to conc in the documentation
- NOAA-GFDL/MOM6@15c9f06 Hard-code min of SN to be 1.0e-7
- NOAA-GFDL/MOM6@8f3cf96 Add placeholders for adding method3 and applying filter on method1
- NOAA-GFDL/MOM6@5583f84 Renames lateral_boundary_mixing to lateral_boundary_diffusion
- NOAA-GFDL/MOM6@69ec18c Removes redundant statement in netrual diffusion
- NOAA-GFDL/MOM6@af41095 Fix uninitialized variables in find_surface when NDIFF_INTERIOR_ONLY = False
- NOAA-GFDL/MOM6@e806fba Fixes a bug in the bulk_method
- NOAA-GFDL/MOM6@d7da982 Improves the calculation of F_bulk to minimize roundoff errors
- NOAA-GFDL/MOM6@82c1bca First set of commits to limit neutral diffusion to the interior
- NOAA-GFDL/MOM6@3c5c7d1 Merge branch 'rewrite_discontinuous_sort' into near_surface_fluxes
- NOAA-GFDL/MOM6@91ca2d1 Fix flux limiter in LBM when < 0
- NOAA-GFDL/MOM6@ca23e66 Make fluxes_bulk_method more roundoff safe
- NOAA-GFDL/MOM6@5aaf34b Add flux limiter for bulk layer fluxes
- NOAA-GFDL/MOM6@9f15e4f Adds new unit test and fixes diagnostics
- NOAA-GFDL/MOM6@c880539 Update LBM flux names and fix posting of 2d diags
- NOAA-GFDL/MOM6@bcec94c Merge branch 'dev/ncar' into fix_MEKE_GM_src
- NOAA-GFDL/MOM6@bb46c38 Calculates bottomFac2 IF CS%MEKE_GEOMETRIC=True
- NOAA-GFDL/MOM6@66a8f0a Fix bug in LBM diagnostics and add diags
- NOAA-GFDL/MOM6@a4f9550 Added new equilibrium formula for MEKE
- NOAA-GFDL/MOM6@73d0d78 Fixes a bug in method2 of LBM, where diffusivities were not used
- NOAA-GFDL/MOM6@4d5c786 Fixes undoxygenized LBM module variables
- NOAA-GFDL/MOM6@e5645b1 Fixes line length exceeding 120
- NOAA-GFDL/MOM6@f38a369 Fixes unit test for layer by layer and removes the hbl_min = MIN(hbl_L, hbl_R)
- NOAA-GFDL/MOM6@c41b8b0 Adds two unit tests for layer by layer method
- NOAA-GFDL/MOM6@6d6d3b8 Adds two unit tests for layer by layer method
- NOAA-GFDL/MOM6@3cb68d3 Adds missing arguments after merge
- NOAA-GFDL/MOM6@62e3227 Adding layer by layer method for bottom boundary
- NOAA-GFDL/MOM6@8d9c6a4 Merge branch 'dev/ncar' into near_surface_fluxes
- NOAA-GFDL/MOM6@3bb1f55 Adding first version of LBM method=2
- NOAA-GFDL/MOM6@4d0aed6 Fixes units and moves bulk diags inside if statement
- NOAA-GFDL/MOM6@f6800c2 Update halos for hbl in LBM
- NOAA-GFDL/MOM6@915bcb1 Diagnostics for lateral boundary mixing scheme
- NOAA-GFDL/MOM6@223a815 Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into HEAD
- NOAA-GFDL/MOM6@322aa77 Rename MOM_boundary_lateral_mixing.F90 for consistency
- NOAA-GFDL/MOM6@332a264 Try to restore commits from accidental move of file
- NOAA-GFDL/MOM6@e5f96f4 Fix minor bugs in lateral boundary mixing
- NOAA-GFDL/MOM6@9b4d2c2 Only allocate KPP_CS if requested
- NOAA-GFDL/MOM6@8ab7aa8 Convert diffusive flux convergence to a change in tracer
- NOAA-GFDL/MOM6@8a4ed84 Guard against case where the boundary layer is 0 on one column
- NOAA-GFDL/MOM6@df938a1 Add masking in lateral_boundary_fluxes
- NOAA-GFDL/MOM6@ae6529e Hook lateral boundary mixing into tracer_hor_diff
- NOAA-GFDL/MOM6@a4dbeb1 Hook in lateral boundary mixing initialization
- NOAA-GFDL/MOM6@2b10a8b Skeleton for boundary layer mixing interfaces
- NOAA-GFDL/MOM6@4e63c75 Update API for boundary_layer_fluxes unit tests
- NOAA-GFDL/MOM6@79bea68 New unit tests for surface boundary fluxes
- NOAA-GFDL/MOM6@f87aaa2 Fixes bulk_average calculation and takes into account partial cells when computing fluxes
- NOAA-GFDL/MOM6@a36f5d6 Removes more trailing space
- NOAA-GFDL/MOM6@17385cc Removes trailing space and fixes line length exceeded
- NOAA-GFDL/MOM6@6677820 Updates layer_fluxes_bulk_method and bulk_average
- NOAA-GFDL/MOM6@8385231 Add function and unit tests for boundary layer mixing
- NOAA-GFDL/MOM6@654a12c Add additional unit tests for bulk method
- NOAA-GFDL/MOM6@576fafb Initial commit for implementing near-surface mixing

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all

@@ -534,6 +534,11 @@ USE_VISBECK = True              !   [Boolean] default = False
 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.
+DEPTH_SCALED_KHTH = False       !   [Boolean] default = False
+                                ! If true, KHTH is scaled away when the depth is shallowerthan a reference
+                                ! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
+                                ! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
+                                ! DEPTH_SCALED_KHTH_EXP.
 RESOLN_SCALED_KHTH = True       !   [Boolean] default = False
                                 ! If true, the interface depth diffusivity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -876,6 +881,9 @@ BETTER_BOUND_KH = True          !   [Boolean] default = True
                                 ! better bounding than just BOUND_KH.
 ANISOTROPIC_VISCOSITY = False   !   [Boolean] default = False
                                 ! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
+ADD_LES_VISCOSITY = False       !   [Boolean] default = False
+                                ! If true, adds the viscosity from Smagorinsky and Leith to the background
+                                ! viscosity instead of taking the maximum.
 BIHARMONIC = True               !   [Boolean] default = True
                                 ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
                                 ! LAPLACIAN.
@@ -1611,6 +1619,11 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! This module implements neutral diffusion of tracers
 USE_NEUTRAL_DIFFUSION = False   !   [Boolean] default = False
                                 ! If true, enables the neutral diffusion module.
+
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+USE_LATERAL_BOUNDARY_DIFFUSION = False !   [Boolean] default = False
+                                ! If true, enables the lateral boundary tracer's diffusion module.
 OBSOLETE_DIAGNOSTIC_IS_FATAL = True !   [Boolean] default = True
                                 ! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
                                 ! error rather than issue a WARNING.

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short

@@ -510,6 +510,9 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! === module MOM_neutral_diffusion ===
 ! This module implements neutral diffusion of tracers
 
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+
 ! === module MOM_sum_output ===
 MAXTRUNC = 1000000              !   [truncations save_interval-1] default = 0
                                 ! The run will be stopped, and the day set to a very large value if the velocity

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all

@@ -534,6 +534,11 @@ USE_VISBECK = True              !   [Boolean] default = False
 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.
+DEPTH_SCALED_KHTH = False       !   [Boolean] default = False
+                                ! If true, KHTH is scaled away when the depth is shallowerthan a reference
+                                ! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
+                                ! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
+                                ! DEPTH_SCALED_KHTH_EXP.
 RESOLN_SCALED_KHTH = True       !   [Boolean] default = False
                                 ! If true, the interface depth diffusivity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -876,6 +881,9 @@ BETTER_BOUND_KH = True          !   [Boolean] default = True
                                 ! better bounding than just BOUND_KH.
 ANISOTROPIC_VISCOSITY = False   !   [Boolean] default = False
                                 ! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
+ADD_LES_VISCOSITY = False       !   [Boolean] default = False
+                                ! If true, adds the viscosity from Smagorinsky and Leith to the background
+                                ! viscosity instead of taking the maximum.
 BIHARMONIC = True               !   [Boolean] default = True
                                 ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
                                 ! LAPLACIAN.
@@ -1610,6 +1618,11 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! This module implements neutral diffusion of tracers
 USE_NEUTRAL_DIFFUSION = False   !   [Boolean] default = False
                                 ! If true, enables the neutral diffusion module.
+
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+USE_LATERAL_BOUNDARY_DIFFUSION = False !   [Boolean] default = False
+                                ! If true, enables the lateral boundary tracer's diffusion module.
 OBSOLETE_DIAGNOSTIC_IS_FATAL = True !   [Boolean] default = True
                                 ! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
                                 ! error rather than issue a WARNING.

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short

@@ -509,6 +509,9 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! === module MOM_neutral_diffusion ===
 ! This module implements neutral diffusion of tracers
 
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+
 ! === module MOM_sum_output ===
 MAXTRUNC = 5000                 !   [truncations save_interval-1] default = 0
                                 ! The run will be stopped, and the day set to a very large value if the velocity

coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all

@@ -534,6 +534,11 @@ USE_VISBECK = True              !   [Boolean] default = False
 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.
+DEPTH_SCALED_KHTH = False       !   [Boolean] default = False
+                                ! If true, KHTH is scaled away when the depth is shallowerthan a reference
+                                ! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
+                                ! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
+                                ! DEPTH_SCALED_KHTH_EXP.
 RESOLN_SCALED_KHTH = True       !   [Boolean] default = False
                                 ! If true, the interface depth diffusivity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -876,6 +881,9 @@ BETTER_BOUND_KH = True          !   [Boolean] default = True
                                 ! better bounding than just BOUND_KH.
 ANISOTROPIC_VISCOSITY = False   !   [Boolean] default = False
                                 ! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
+ADD_LES_VISCOSITY = False       !   [Boolean] default = False
+                                ! If true, adds the viscosity from Smagorinsky and Leith to the background
+                                ! viscosity instead of taking the maximum.
 BIHARMONIC = True               !   [Boolean] default = True
                                 ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
                                 ! LAPLACIAN.
@@ -1610,6 +1618,11 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! This module implements neutral diffusion of tracers
 USE_NEUTRAL_DIFFUSION = False   !   [Boolean] default = False
                                 ! If true, enables the neutral diffusion module.
+
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+USE_LATERAL_BOUNDARY_DIFFUSION = False !   [Boolean] default = False
+                                ! If true, enables the lateral boundary tracer's diffusion module.
 OBSOLETE_DIAGNOSTIC_IS_FATAL = True !   [Boolean] default = True
                                 ! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
                                 ! error rather than issue a WARNING.

coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short

@@ -509,6 +509,9 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! === module MOM_neutral_diffusion ===
 ! This module implements neutral diffusion of tracers
 
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+
 ! === module MOM_sum_output ===
 MAXTRUNC = 5000                 !   [truncations save_interval-1] default = 0
                                 ! The run will be stopped, and the day set to a very large value if the velocity

coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all

@@ -534,6 +534,11 @@ USE_VISBECK = True              !   [Boolean] default = False
 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.
+DEPTH_SCALED_KHTH = False       !   [Boolean] default = False
+                                ! If true, KHTH is scaled away when the depth is shallowerthan a reference
+                                ! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
+                                ! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
+                                ! DEPTH_SCALED_KHTH_EXP.
 RESOLN_SCALED_KHTH = True       !   [Boolean] default = False
                                 ! If true, the interface depth diffusivity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -876,6 +881,9 @@ BETTER_BOUND_KH = True          !   [Boolean] default = True
                                 ! better bounding than just BOUND_KH.
 ANISOTROPIC_VISCOSITY = False   !   [Boolean] default = False
                                 ! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
+ADD_LES_VISCOSITY = False       !   [Boolean] default = False
+                                ! If true, adds the viscosity from Smagorinsky and Leith to the background
+                                ! viscosity instead of taking the maximum.
 BIHARMONIC = True               !   [Boolean] default = True
                                 ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
                                 ! LAPLACIAN.
@@ -1610,6 +1618,11 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! This module implements neutral diffusion of tracers
 USE_NEUTRAL_DIFFUSION = False   !   [Boolean] default = False
                                 ! If true, enables the neutral diffusion module.
+
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+USE_LATERAL_BOUNDARY_DIFFUSION = False !   [Boolean] default = False
+                                ! If true, enables the lateral boundary tracer's diffusion module.
 OBSOLETE_DIAGNOSTIC_IS_FATAL = True !   [Boolean] default = True
                                 ! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
                                 ! error rather than issue a WARNING.

coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.short

@@ -512,6 +512,9 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! === module MOM_neutral_diffusion ===
 ! This module implements neutral diffusion of tracers
 
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+
 ! === module MOM_sum_output ===
 MAXTRUNC = 5000                 !   [truncations save_interval-1] default = 0
                                 ! The run will be stopped, and the day set to a very large value if the velocity

ice_ocean_SIS2/Baltic/MOM_parameter_doc.all

@@ -534,6 +534,11 @@ USE_VISBECK = True              !   [Boolean] default = False
 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.
+DEPTH_SCALED_KHTH = False       !   [Boolean] default = False
+                                ! If true, KHTH is scaled away when the depth is shallowerthan a reference
+                                ! depth: KHTH = MIN(1,H/H0)**N * KHTH, where H0 is a reference depth, controlled
+                                ! via DEPTH_SCALED_KHTH_H0, and the exponent (N) is controlled via
+                                ! DEPTH_SCALED_KHTH_EXP.
 RESOLN_SCALED_KHTH = True       !   [Boolean] default = False
                                 ! If true, the interface depth diffusivity is scaled away when the first
                                 ! baroclinic deformation radius is well resolved.
@@ -876,6 +881,9 @@ BETTER_BOUND_KH = True          !   [Boolean] default = True
                                 ! better bounding than just BOUND_KH.
 ANISOTROPIC_VISCOSITY = False   !   [Boolean] default = False
                                 ! If true, allow anistropic viscosity in the Laplacian horizontal viscosity.
+ADD_LES_VISCOSITY = False       !   [Boolean] default = False
+                                ! If true, adds the viscosity from Smagorinsky and Leith to the background
+                                ! viscosity instead of taking the maximum.
 BIHARMONIC = True               !   [Boolean] default = True
                                 ! If true, use a biharmonic horizontal viscosity. BIHARMONIC may be used with
                                 ! LAPLACIAN.
@@ -1610,6 +1618,11 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! This module implements neutral diffusion of tracers
 USE_NEUTRAL_DIFFUSION = False   !   [Boolean] default = False
                                 ! If true, enables the neutral diffusion module.
+
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+USE_LATERAL_BOUNDARY_DIFFUSION = False !   [Boolean] default = False
+                                ! If true, enables the lateral boundary tracer's diffusion module.
 OBSOLETE_DIAGNOSTIC_IS_FATAL = True !   [Boolean] default = True
                                 ! If an obsolete diagnostic variable appears in the diag_table, cause a FATAL
                                 ! error rather than issue a WARNING.

ice_ocean_SIS2/Baltic/MOM_parameter_doc.short

@@ -520,6 +520,9 @@ ML_KHTR_SCALE = 0.0             !   [nondim] default = 1.0
 ! === module MOM_neutral_diffusion ===
 ! This module implements neutral diffusion of tracers
 
+! === module MOM_lateral_boundary_diffusion ===
+! This module implements lateral diffusion of tracers near boundaries
+
 ! === module MOM_sum_output ===
 MAXTRUNC = 5000                 !   [truncations save_interval-1] default = 0
                                 ! The run will be stopped, and the day set to a very large value if the velocity