Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes gotm interface for vertical mixing #6509

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fixes gotm interface for vertical mixing #6509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/mpas-ocean/src/shared/mpas_ocn_tendency.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down