From 25464521f07859148a91e62b0b7a30eb18ee1ac8 Mon Sep 17 00:00:00 2001 From: Luke Van Roekel Date: Thu, 11 Jul 2024 16:11:22 -0500 Subject: [PATCH] Fixes gotm interface for vertical mixing if GOTM is enabled surface friction velocity is not calculated at present. This fixes that issue Addresses #6507 --- components/mpas-ocean/src/shared/mpas_ocn_tendency.F | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/mpas-ocean/src/shared/mpas_ocn_tendency.F b/components/mpas-ocean/src/shared/mpas_ocn_tendency.F index a16e52f14499..99a3bf49844b 100644 --- a/components/mpas-ocean/src/shared/mpas_ocn_tendency.F +++ b/components/mpas-ocean/src/shared/mpas_ocn_tendency.F @@ -1243,12 +1243,12 @@ subroutine ocn_tend_tracer(tendPool, statePool, forcingPool, & ! ! Compute tracer tendency due to non-local flux computed in KPP ! - if (config_use_cvmix_kpp) then - call mpas_timer_start("non-local flux from KPP") - if (.not. config_cvmix_kpp_nonlocal_with_implicit_mix) then - call ocn_compute_KPP_input_fields(statePool, forcingPool,& + if (config_use_cvmix_kpp .or. config_use_gotm) then + call ocn_compute_KPP_input_fields(statePool, forcingPool,& meshPool, timeLevel) + if (.not. config_cvmix_kpp_nonlocal_with_implicit_mix) then + call mpas_timer_start("non-local flux from KPP") if (computeBudgets) then !$omp parallel !$omp do schedule(runtime) private(k,n) @@ -1291,8 +1291,8 @@ subroutine ocn_tend_tracer(tendPool, statePool, forcingPool, & !$omp end do !$omp end parallel endif ! compute budgets + call mpas_timer_stop("non-local flux from KPP") end if ! not non-local with implicit mix - call mpas_timer_stop("non-local flux from KPP") end if ! KPP ! Compute tracer tendency due to production/destruction of