Fix to sponge verbosity, also some documentation.

docs/parameterizations_lateral.rst

@@ -43,4 +43,6 @@ Tidal forcing
 -------------
 
 Astronomical tidal forcings and self-attraction and loading are implement in MOM_tidal_forcing.
+Tides can also be added via an open boundary tidal specification,
+see [OBC wiki page](https://github.com/NOAA-GFDL/MOM6-examples/wiki/Open-Boundary-Conditions).
 

docs/parameterizations_vertical.rst

@@ -23,13 +23,12 @@ Interior and bottom-driven mixing
 Kappa-shear
   MOM_kappa_shear implements the shear-driven mixing of :cite:`jackson2008`.
 
-   :ref:`Internal_Shear_Mixing`
-
 Internal-tide driven mixing
 
   The schemes of :cite:`st_laurent2002`, :cite:`polzin2009`, and :cite:`melet2012`, are all implemented through MOM_set_diffusivity and MOM_diabatic_driver.
 
-   :ref:`Internal_Tidal_Mixing`
+   :ref:`Internal_Vert_Mixing`
+
 
 Vertical friction
 -----------------

docs/zotero.bib

@@ -1728,7 +1728,7 @@ @article{adcroft2006
 	pages = {224--233}
 }
 
-@article{adcroft2004,
+@article{adcroft2004-1,
 	title = {Rescaled height coordinates for accurate representation of free-surface flows in ocean circulation models},
 	volume = {7},
 	issn = {1463-5003},
@@ -2308,7 +2308,7 @@ @article{carpenter1990
 	doi = {https://doi.org/10.1175/1520-0493(1990)118<0586:AOTPPM>2.0.CO;2}
 }
 
-@article{kasahara1974,
+@article{kasahara1974-1,
 	title = {Various {Vertical} {Coordinate} {Systems} {Used} for {Numerical} {Weather} {Prediction}},
 	volume = {102},
 	issn = {0027-0644},
@@ -2675,3 +2675,12 @@ @article{bryan1979
 	journal = {J. Geophys. Res.}
 }
 
+@techreport{griffies2015a,
+	author = {S. M. Griffies and M. Levy and A. J. Adcroft and G. Danabasoglu and R.
+	    W. Hallberg and D. Jacobsen and W. Large and T. Ringler},
+	title = {Theory and Numerics of the Community Ocean Vertical Mixing (CVMix)
+    	    Project},
+	year = {2015},
+	pages = {98 pp},
+	institution = {NOAA GFDL}
+}

src/core/MOM_barotropic.F90

@@ -2359,7 +2359,8 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce,
     if (GV%Boussinesq) then
       do j=js,je ; do i=is,ie
         if ((eta(i,j) < -GV%Z_to_H*G%bathyT(i,j)) .and. (G%mask2dT(i,j) > 0.0)) then
-          write(mesg,'(ES24.16," vs. ",ES24.16)') GV%H_to_m*eta(i,j), -US%Z_to_m*G%bathyT(i,j)
+          write(mesg,'(ES24.16," vs. ",ES24.16, " at ", ES12.4, ES12.4, i7, i7)') GV%H_to_m*eta(i,j), &
+               -US%Z_to_m*G%bathyT(i,j), G%geoLonT(i,j), G%geoLatT(i,j), i + G%isd_global, j + G%jsd_global
           if (err_count < 2) &
             call MOM_error(WARNING, "btstep: eta has dropped below bathyT: "//trim(mesg), all_print=.true.)
           err_count = err_count + 1

src/framework/MOM_horizontal_regridding.F90

@@ -9,6 +9,7 @@ module MOM_horizontal_regridding
 use MOM_domains,       only : pass_var
 use MOM_error_handler, only : MOM_mesg, MOM_error, FATAL, WARNING, is_root_pe
 use MOM_error_handler, only : callTree_enter, callTree_leave, callTree_waypoint
+use MOM_error_handler, only : MOM_get_verbosity
 use MOM_file_parser,   only : get_param, log_param, log_version, param_file_type
 use MOM_grid,          only : ocean_grid_type
 use MOM_interpolate,   only : time_interp_external, horiz_interp_init
@@ -676,6 +677,7 @@ subroutine horiz_interp_and_extrap_tracer_fms_id(fms_id,  Time, conversion, G, t
   real, dimension(SZI_(G),SZJ_(G)) :: good2   ! 1 where the data is valid after Ice-9
   real, dimension(SZI_(G),SZJ_(G)) :: fill2   ! 1 for points that still need to be filled after Ice-9
   integer :: turns
+  integer :: verbosity
 
   turns = G%HI%turns
 
@@ -696,6 +698,8 @@ subroutine horiz_interp_and_extrap_tracer_fms_id(fms_id,  Time, conversion, G, t
 
   call get_external_field_info(fms_id, size=fld_sz, axes=axes_data, missing=missing_value)
 
+  verbosity = MOM_get_verbosity()
+
   id = fld_sz(1) ; jd  = fld_sz(2) ; kd = fld_sz(3)
 
   spongeDataOngrid = .false.
@@ -764,7 +768,7 @@ subroutine horiz_interp_and_extrap_tracer_fms_id(fms_id,  Time, conversion, G, t
 
   if (.not.spongeDataOngrid) then
     if (is_root_pe()) &
-      call time_interp_external(fms_id, Time, data_in, verbose=.true., turns=turns)
+      call time_interp_external(fms_id, Time, data_in, verbose=(verbosity>5), turns=turns)
     ! Loop through each data level and interpolate to model grid.
     ! After interpolating, fill in points which will be needed to define the layers.
     do k=1,kd
@@ -880,7 +884,7 @@ subroutine horiz_interp_and_extrap_tracer_fms_id(fms_id,  Time, conversion, G, t
 
     enddo ! kd
   else
-      call time_interp_external(fms_id, Time, data_in, verbose=.true., turns=turns)
+      call time_interp_external(fms_id, Time, data_in, verbose=(verbosity>5), turns=turns)
       do k=1,kd
         do j=js,je
           do i=is,ie