From 53e7a8732c3ad6d4ac4a0fba132489c5c020589d Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Tue, 26 Jun 2018 10:57:34 -0600 Subject: [PATCH] Fix bugs --- src/parameterizations/vertical/MOM_CVMix_KPP.F90 | 8 ++++---- src/parameterizations/vertical/MOM_set_viscosity.F90 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 index 24ad3ac42d..bfa6a6dd44 100644 --- a/src/parameterizations/vertical/MOM_CVMix_KPP.F90 +++ b/src/parameterizations/vertical/MOM_CVMix_KPP.F90 @@ -932,10 +932,10 @@ subroutine KPP_calculate(CS, G, GV, h, Temp, Salt, u, v, EOS, uStar, & ! safety check, Kviscosity and Kdiffusivity must be >= 0 do k=1, G%ke+1 - if (Kviscosity(k) < 0. .or Kdiffusivity(k,1) < 0.) then - call MOM_error(FATAL,"KPP_calculate, after CVMix_coeffs_kpp: \n "// & - "Negative vertical viscosity or diffusivity has been detected. \n" // & - "This is likely related to the choice of MATCH_TECHNIQUE and INTERP_TYPE2. \n" //& + if (Kviscosity(k) < 0. .or. Kdiffusivity(k,1) < 0.) then + call MOM_error(FATAL,"KPP_calculate, after CVMix_coeffs_kpp: "// & + "Negative vertical viscosity or diffusivity has been detected. " // & + "This is likely related to the choice of MATCH_TECHNIQUE and INTERP_TYPE2." //& "You might consider using the default options for these parameters." ) endif enddo diff --git a/src/parameterizations/vertical/MOM_set_viscosity.F90 b/src/parameterizations/vertical/MOM_set_viscosity.F90 index 4a85f88028..427a0284ba 100644 --- a/src/parameterizations/vertical/MOM_set_viscosity.F90 +++ b/src/parameterizations/vertical/MOM_set_viscosity.F90 @@ -1834,7 +1834,7 @@ subroutine set_visc_init(Time, G, GV, param_file, diag, visc, CS, OBC) real :: omega_frac_dflt integer :: isd, ied, jsd, jed, IsdB, IedB, JsdB, JedB, nz, i, j, n logical :: use_kappa_shear, adiabatic, use_omega - logical :: use_CVMix_ddiff, differential_diffusion + logical :: use_CVMix_ddiff, differential_diffusion, use_KPP type(OBC_segment_type), pointer :: segment ! pointer to OBC segment type ! This include declares and sets the variable "version". #include "version_variable.h" @@ -2000,9 +2000,9 @@ subroutine set_visc_init(Time, G, GV, param_file, diag, visc, CS, OBC) do_not_log=.true., default=.false.) if (use_KPP .and. visc%add_Kv_slow) call MOM_error(FATAL,"set_visc_init: "//& - "When USE_KPP=True, ADD_KV_SLOW must be false. Otherwise vertical \n"//& - "vertical visc. due to slow processes will be double counted. Please set \n"//& - "ADD_KV_SLOW=False".) + "When USE_KPP=True, ADD_KV_SLOW must be false. Otherwise vertical "//& + "viscosity due to slow processes will be double counted. Please set "//& + "ADD_KV_SLOW=False.") call get_param(param_file, mdl, "KV_BBL_MIN", CS%KV_BBL_min, & "The minimum viscosities in the bottom boundary layer.", &