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

Compute dz in the halo for OBC segments #520

Merged
merged 4 commits into from
Mar 9, 2024
Merged

Compute dz in the halo for OBC segments #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edae412
Compute dz in the halo for OBC segments
kshedstrom Nov 15, 2023
58583b5
More updates for reproducible layouts
kshedstrom Nov 16, 2023
fc23f99
The dz halo is behaving today, I don't know
kshedstrom Nov 16, 2023
486486d
Remove allocated test for CS%uhtr
Hallberg-NOAA Mar 8, 2024
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
5 changes: 4 additions & 1 deletion src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,8 +1436,11 @@ subroutine step_MOM_tracer_dyn(CS, G, GV, US, h, Time_local)
CS%tracer_diff_CSp, CS%tracer_Reg, CS%tv)
if (CS%debug) call MOM_tracer_chksum("Post-diffuse ", CS%tracer_Reg, G)
if (showCallTree) call callTree_waypoint("finished tracer advection/diffusion (step_MOM)")
call update_segment_tracer_reservoirs(G, GV, CS%uhtr, CS%vhtr, h, CS%OBC, &
if (associated(CS%OBC)) then
call pass_vector(CS%uhtr, CS%vhtr, G%Domain)
call update_segment_tracer_reservoirs(G, GV, CS%uhtr, CS%vhtr, h, CS%OBC, &
CS%t_dyn_rel_adv, CS%tracer_Reg)
endif
call cpu_clock_end(id_clock_tracer) ; call cpu_clock_end(id_clock_thermo)

call cpu_clock_begin(id_clock_other) ; call cpu_clock_begin(id_clock_diagnostics)
Expand Down
3 changes: 2 additions & 1 deletion src/tracer/MOM_tracer_advect.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ subroutine advect_tracer(h_end, uhtr, vhtr, OBC, dt, G, GV, US, CS, Reg, x_first
x_first = (MOD(G%first_direction,2) == 0)

! increase stencil size for Colella & Woodward PPM
if (CS%usePPM .and. .not. CS%useHuynh) stencil = 3
! if (CS%usePPM .and. .not. CS%useHuynh) stencil = 3
if (CS%usePPM) stencil = 3

ntr = Reg%ntr
Idt = 1.0 / dt
Expand Down
Loading