diff --git a/src/framework/MOM_io.F90 b/src/framework/MOM_io.F90 index 5c46a13062..44fe6d3ae7 100644 --- a/src/framework/MOM_io.F90 +++ b/src/framework/MOM_io.F90 @@ -503,13 +503,13 @@ function num_timelevels(filename, varname, min_dims) result(n_time) allocate(varids(nvars)) - status = nf90_inq_varids(ncid, nvars, varids) - if (status /= NF90_NOERR) then - call MOM_error(WARNING,"num_timelevels: "//& - " Difficulties getting the variable IDs in file "//& - trim(filename)//" - "//trim(NF90_STRERROR(status))) - deallocate(varids) ; return - endif +! status = nf90_inq_varids(ncid, nvars, varids) +! if (status /= NF90_NOERR) then +! call MOM_error(WARNING,"num_timelevels: "//& +! " Difficulties getting the variable IDs in file "//& +! trim(filename)//" - "//trim(NF90_STRERROR(status))) +! deallocate(varids) ; return +! endif do n = 1,nvars status = nf90_inquire_variable(ncid, varids(n), name=name) diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90 index 2968934586..8984ac3a34 100644 --- a/src/parameterizations/lateral/MOM_MEKE.F90 +++ b/src/parameterizations/lateral/MOM_MEKE.F90 @@ -387,7 +387,7 @@ subroutine step_forward_MEKE(MEKE, h, SN_u, SN_v, visc, dt, G, GV, CS, hu, hv) !$OMP cdrag2,bottomFac2,MEKE_decay,barotrFac2, & !$OMP use_drag_rate,dt,baroHu,baroHv) & !$OMP private(Kh_here,Inv_Kh_max,ldamping,advFac) - if (CS%MEKE_KH >= 0.0 .or. CS%MEKE_advection_factor >0.) then + if (CS%MEKE_KH >= 0.0 .or. CS%KhMEKE_FAC > 0.0 .or. CS%MEKE_advection_factor >0.0) then ! Lateral diffusion of MEKE Kh_here = max(0.,CS%MEKE_Kh) !$OMP do