Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions src/Models/NonhydrostaticModels/boundary_mass_fluxes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,11 @@ function initialize_boundary_mass_fluxes(velocities::NamedTuple)
right_matching_scheme_boundaries,
total_area_matching_scheme_boundaries))

return boundary_fluxes
if length(left_matching_scheme_boundaries) == 0 && length(right_matching_scheme_boundaries) == 0
return nothing
else
return boundary_fluxes
end
end

update_open_boundary_mass_fluxes!(model) = map(compute!, model.boundary_mass_fluxes)
Expand Down Expand Up @@ -209,17 +213,19 @@ correct_right_boundary_mass_flux!(v, bc::IOBC, ::Val{:north}, A⁻¹_∮udA) = n
correct_right_boundary_mass_flux!(w, bc::IOBC, ::Val{:top}, A⁻¹_∮udA) = nothing
correct_right_boundary_mass_flux!(u, bc, side, A⁻¹_∮udA) = nothing

enforce_open_boundary_mass_conservation!(model, ::Nothing) = nothing

"""
enforce_open_boundary_mass_conservation!(model::NonhydrostaticModel)
enforce_open_boundary_mass_conservation!(model, boundary_mass_fluxes)

Correct boundary mass fluxes for perturbation advection boundary conditions to ensure
zero net mass flux through each boundary.
"""
function enforce_open_boundary_mass_conservation!(model)
function enforce_open_boundary_mass_conservation!(model, boundary_mass_fluxes)
u, v, w = model.velocities

∮udA = open_boundary_mass_inflow(model)
A = model.boundary_mass_fluxes.total_area_matching_scheme_boundaries
A = boundary_mass_fluxes.total_area_matching_scheme_boundaries

A⁻¹_∮udA = ∮udA / A

Expand Down
4 changes: 2 additions & 2 deletions src/Models/NonhydrostaticModels/pressure_correction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function compute_pressure_correction!(model::NonhydrostaticModel, Δt)
foreach(mask_immersed_field!, model.velocities)
fill_halo_regions!(model.velocities, model.clock, fields(model))

enforce_open_boundary_mass_conservation!(model)
enforce_open_boundary_mass_conservation!(model, model.boundary_mass_fluxes)

solve_for_pressure!(model.pressures.pNHS, model.pressure_solver, Δt, model.velocities)
fill_halo_regions!(model.pressures.pNHS)
Expand Down Expand Up @@ -44,7 +44,7 @@ function make_pressure_correction!(model::NonhydrostaticModel, Δt)
model.velocities,
model.grid,
model.pressures.pNHS)

ϵ = eps(eltype(model.pressures.pNHS))
Δt⁺ = max(ϵ, Δt)
model.pressures.pNHS ./= Δt⁺
Expand Down
Loading