Skip to content

Refactor subcell_limiting_kernel! => volume_integral_kernel! #2821

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

Merged
DanielDoehring merged 8 commits into from
Feb 23, 2026
Merged

Refactor subcell_limiting_kernel! => volume_integral_kernel! #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
383ae8c
refactor
DanielDoehring Feb 22, 2026
7b9246c
AVI additions
DanielDoehring Feb 22, 2026
598805d
todo
DanielDoehring Feb 22, 2026
8dadb17
revert VIA
DanielDoehring Feb 22, 2026
a116143
revert
DanielDoehring Feb 22, 2026
4ee96d7
rev
DanielDoehring Feb 22, 2026
2ce5c0e
Merge branch 'main' into RefactorVISCL
DanielDoehring Feb 22, 2026
a17bec5
Merge branch 'main' into RefactorVISCL
DanielDoehring Feb 22, 2026
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
2 changes: 1 addition & 1 deletion src/callbacks_stage/subcell_bounds_check_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@inline function check_bounds(u, equations::AbstractEquations{2},
solver, cache, limiter::SubcellLimiterIDP)
(; local_twosided, positivity, local_onesided) = solver.volume_integral.limiter
(; local_twosided, positivity, local_onesided) = limiter
(; variable_bounds) = limiter.cache.subcell_limiter_coefficients
(; idp_bounds_delta_local, idp_bounds_delta_global) = limiter.cache

Expand Down
2 changes: 1 addition & 1 deletion src/callbacks_stage/subcell_bounds_check_3d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@inline function check_bounds(u, equations::AbstractEquations{3},
solver, cache, limiter::SubcellLimiterIDP)
(; local_twosided, positivity, local_onesided) = solver.volume_integral.limiter
(; local_twosided, positivity, local_onesided) = limiter
(; variable_bounds) = limiter.cache.subcell_limiter_coefficients
(; idp_bounds_delta_local, idp_bounds_delta_global) = limiter.cache

Expand Down
6 changes: 2 additions & 4 deletions src/callbacks_stage/subcell_limiter_idp_correction.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ function (limiter!::SubcellLimiterIDPCorrection)(u_ode, semi, t, dt,
# Calculate blending factor alpha in [0,1]
# f_ij = alpha_ij * f^(FV)_ij + (1 - alpha_ij) * f^(DG)_ij
# = f^(FV)_ij + (1 - alpha_ij) * f^(antidiffusive)_ij
@trixi_timeit timer() "blending factors" solver.volume_integral.limiter(u, semi,
equations,
solver, t,
dt)
@trixi_timeit timer() "blending factors" limiter(u, semi, equations, solver,
t, dt)

perform_idp_correction!(u, dt, mesh, equations, solver, cache)

Expand Down
13 changes: 7 additions & 6 deletions src/solvers/dgsem_p4est/dg_3d_subcell_limiters.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,14 @@ function create_cache(mesh::P4estMesh{3},
flux_temp_threaded, fhat_temp_threaded)
end

@inline function subcell_limiting_kernel!(du, u, element,
mesh::P4estMesh{3},
nonconservative_terms, equations,
volume_integral, limiter::SubcellLimiterIDP,
dg::DGSEM, cache)
# Subcell limiting currently only implemented for certain mesh types
@inline function volume_integral_kernel!(du, u, element,
mesh::P4estMesh{3},
nonconservative_terms, equations,
volume_integral::VolumeIntegralSubcellLimiting,
dg::DGSEM, cache)
@unpack inverse_weights = dg.basis # Plays role of DG subcell sizes
@unpack volume_flux_dg, volume_flux_fv = volume_integral
@unpack volume_flux_dg, volume_flux_fv, limiter = volume_integral

# high-order DG fluxes
@unpack fhat1_L_threaded, fhat1_R_threaded, fhat2_L_threaded, fhat2_R_threaded, fhat3_L_threaded, fhat3_R_threaded = cache
Expand Down
32 changes: 7 additions & 25 deletions src/solvers/dgsem_tree/dg_2d_subcell_limiters.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,14 @@ function create_cache(mesh::Union{TreeMesh{2}, StructuredMesh{2}, P4estMesh{2}},
end

# Subcell limiting currently only implemented for certain mesh types
function calc_volume_integral!(du, u,
mesh::Union{TreeMesh{2}, StructuredMesh{2},
P4estMesh{2}, P4estMesh{3}},
have_nonconservative_terms, equations,
volume_integral::VolumeIntegralSubcellLimiting,
dg::DGSEM, cache)
@unpack limiter = volume_integral

@threaded for element in eachelement(dg, cache)
subcell_limiting_kernel!(du, u, element, mesh,
have_nonconservative_terms, equations,
volume_integral, limiter,
dg, cache)
end

return nothing
end

@inline function subcell_limiting_kernel!(du, u, element,
mesh::Union{TreeMesh{2}, StructuredMesh{2},
P4estMesh{2}},
have_nonconservative_terms, equations,
volume_integral, limiter::SubcellLimiterIDP,
dg::DGSEM, cache)
@inline function volume_integral_kernel!(du, u, element,
mesh::Union{TreeMesh{2}, StructuredMesh{2},
P4estMesh{2}},
have_nonconservative_terms, equations,
volume_integral::VolumeIntegralSubcellLimiting,
dg::DGSEM, cache)
@unpack inverse_weights = dg.basis # Plays role of inverse DG-subcell sizes
@unpack volume_flux_dg, volume_flux_fv = volume_integral
@unpack volume_flux_dg, volume_flux_fv, limiter = volume_integral

# high-order DG fluxes
@unpack fhat1_L_threaded, fhat1_R_threaded, fhat2_L_threaded, fhat2_R_threaded = cache
Expand Down
Loading