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

Adiabatic clock ID bugfix #1034

Merged
merged 3 commits into from
Nov 22, 2019
Merged

Adiabatic clock ID bugfix #1034

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8f106a
Adiabatic clock ID bugfix
marshallward Nov 19, 2019
4b241f6
Merge branch 'dev/gfdl' into adiabatic_clock_id_fix
adcroft Nov 22, 2019
686302e
Update MOM.F90
marshallward Nov 22, 2019
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
12 changes: 8 additions & 4 deletions src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ module MOM
integer :: id_clock_thermo
integer :: id_clock_tracer
integer :: id_clock_diabatic
integer :: id_clock_adiabatic
integer :: id_clock_continuity ! also in dynamics s/r
integer :: id_clock_thick_diff
integer :: id_clock_BBL_visc
Expand Down Expand Up @@ -1275,10 +1276,10 @@ subroutine step_MOM_thermo(CS, G, GV, US, u, v, h, tv, fluxes, dtdia, &
call cpu_clock_end(id_clock_diabatic)
else ! complement of "if (.not.CS%adiabatic)"

call cpu_clock_begin(id_clock_diabatic)
call adiabatic(h, tv, fluxes, dtdia, G, GV, US, CS%diabatic_CSp)
call cpu_clock_begin(id_clock_adiabatic)
call adiabatic(h, tv, fluxes, US%T_to_s*dtdia, G, GV, US, CS%diabatic_CSp)
fluxes%fluxes_used = .true.
call cpu_clock_end(id_clock_diabatic)
call cpu_clock_end(id_clock_adiabatic)

if (associated(tv%T)) then
call create_group_pass(pass_T_S, tv%T, G%Domain, To_All+Omit_Corners, halo=1)
Expand Down Expand Up @@ -2565,8 +2566,11 @@ subroutine MOM_timing_init(CS)
id_clock_thermo = cpu_clock_id('Ocean thermodynamics and tracers', grain=CLOCK_SUBCOMPONENT)
id_clock_other = cpu_clock_id('Ocean Other', grain=CLOCK_SUBCOMPONENT)
id_clock_tracer = cpu_clock_id('(Ocean tracer advection)', grain=CLOCK_MODULE_DRIVER)
if (.not.CS%adiabatic) &
if (.not.CS%adiabatic) then
id_clock_diabatic = cpu_clock_id('(Ocean diabatic driver)', grain=CLOCK_MODULE_DRIVER)
else
id_clock_adiabatic = cpu_clock_id('(Ocean adiabatic driver)', grain=CLOCK_MODULE_DRIVER)
endif

id_clock_continuity = cpu_clock_id('(Ocean continuity equation *)', grain=CLOCK_MODULE)
id_clock_BBL_visc = cpu_clock_id('(Ocean set BBL viscosity)', grain=CLOCK_MODULE)
Expand Down