Merge branch 'param_bugfixes'

Author: mnlevy1981

src/shared/cvmix_kpp.F90

@@ -1425,7 +1425,7 @@ subroutine cvmix_kpp_compute_OBL_depth_low(Ri_bulk, zw_iface, OBL_depth,    &
     ! Error checks
     ! (1) if using Ekman length, need to pass surf_fric and Coriolis
     if ((.not.(present(surf_fric).and.present(Coriolis))).and.                &
-        CVmix_kpp_params_in%lMonOb) then
+        CVmix_kpp_params_in%lEkman) then
       print*, "ERROR: must pass surf_fric and Coriolis if you want to ",      &
                 "compute Ekman length"
       stop 1

src/shared/cvmix_shear.F90

@@ -384,7 +384,7 @@ subroutine cvmix_coeffs_shear_low(Mdiff_out, Tdiff_out, RICH, nlev,         &
         PP_alpha   = CVmix_shear_params%PP_alpha
         loc_exp    = CVmix_shear_params%PP_exp
         PP_nu_b    = CVmix_shear_params%PP_nu_b
-        PP_kappa_b = CVmix_shear_params%PP_nu_b
+        PP_kappa_b = CVmix_shear_params%PP_kappa_b
 
         ! Pacanowski-Philander
         do kw=1,nlev+1