rename KPP_compute_OBL as KPP_compute_BLD

NOAA-GFDL · May 8, 2018 · 82d9228 · 82d9228
1 parent 85810d2
commit 82d9228
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/parameterizations/vertical/MOM_KPP.F90 b/src/parameterizations/vertical/MOM_KPP.F90
@@ -28,6 +28,7 @@ module MOM_KPP
 #include "MOM_memory.h"
 
 public :: KPP_init
+public :: KPP_compute_BLD
 public :: KPP_calculate
 public :: KPP_end
 public :: KPP_NonLocalTransport_temp
@@ -171,6 +172,10 @@ logical function KPP_init(paramFile, G, diag, Time, CS, passive)
                  'If False, calculates the non-local transport and tendencies but\n'//&
                  'purely for diagnostic purposes.',                                   &
                  default=.not. CS%passiveMode)
+  call get_param(paramFile, mdl, 'APPLY_KPP_OBL_FILTER', CS%applyNonLocalTrans,  &
+                 'If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT.\n'//  &
+                 'computed via CVMix to reduce any horizontal two-grid-point noise.',   &
+                 default=.false.)
   call get_param(paramFile, mdl, 'RI_CRIT', CS%Ri_crit,                            &
                  'Critical bulk Richardson number used to define depth of the\n'// &
                  'surface Ocean Boundary Layer (OBL).',                            &
@@ -407,7 +412,7 @@ end function KPP_init
 
 
 !> Compute OBL depth
-subroutine KPP_compute_OBL(CS, G, GV, h, Temp, Salt, u, v, EOS, uStar, buoyFlux)
+subroutine KPP_compute_BLD(CS, G, GV, h, Temp, Salt, u, v, EOS, uStar, buoyFlux)
 
   ! Arguments
   type(KPP_CS),                           pointer       :: CS             !< Control structure
@@ -718,7 +723,7 @@ subroutine KPP_compute_OBL(CS, G, GV, h, Temp, Salt, u, v, EOS, uStar, buoyFlux)
     enddo
   enddo
 
-end subroutine KPP_compute_OBL
+end subroutine KPP_compute_BLD
 
 
 !> KPP vertical diffusivity/viscosity and non-local tracer transport

diff --git a/src/parameterizations/vertical/MOM_diabatic_driver.F90 b/src/parameterizations/vertical/MOM_diabatic_driver.F90
@@ -49,7 +49,8 @@ module MOM_diabatic_driver
 use MOM_internal_tides,      only : propagate_int_tide
 use MOM_internal_tides,      only : internal_tides_init, internal_tides_end, int_tide_CS
 use MOM_kappa_shear,         only : kappa_shear_is_used
-use MOM_KPP,                 only : KPP_CS, KPP_init, KPP_calculate, KPP_end, KPP_get_BLD
+use MOM_KPP,                 only : KPP_CS, KPP_init, KPP_compute_BLD, KPP_calculate
+use MOM_KPP,                 only : KPP_end, KPP_get_BLD
 use MOM_KPP,                 only : KPP_NonLocalTransport_temp, KPP_NonLocalTransport_saln
 use MOM_opacity,             only : opacity_init, set_opacity, opacity_end, opacity_CS
 use MOM_regularize_layers,   only : regularize_layers, regularize_layers_init, regularize_layers_CS
@@ -635,6 +636,9 @@ subroutine diabatic(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, G, G
     endif
 !$OMP end parallel
 
+    call KPP_compute_BLD(CS%KPP_CSp, G, GV, h, tv%T, tv%S, u, v, tv%eqn_of_state, &
+      fluxes%ustar, CS%KPP_buoy_flux)
+
     call KPP_calculate(CS%KPP_CSp, G, GV, h, tv%T, tv%S, u, v, tv%eqn_of_state, &
       fluxes%ustar, CS%KPP_buoy_flux, Kd_heat, Kd_salt, visc%Kv_shear, CS%KPP_NLTheat, CS%KPP_NLTscalar)
 !$OMP parallel default(none) shared(is,ie,js,je,nz,Kd_salt,Kd_int,visc,CS,Kd_heat)