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

Finalize callbacks for custom time integrators #2304

Merged
merged 6 commits into from
Mar 7, 2025
Merged

Finalize callbacks for custom time integrators #2304

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54bb234
finalize callbacks for custom time integrators
JoshuaLampert Mar 7, 2025
597ffd1
stage callbacks only for SSP methods
JoshuaLampert Mar 7, 2025
9588092
remove unnecessary line
JoshuaLampert Mar 7, 2025
8748d05
also finalize continuous_callbacks
JoshuaLampert Mar 7, 2025
c9d5012
format
JoshuaLampert Mar 7, 2025
57a8f0c
Merge branch 'main' into finalize-callbacks-custom-time-integrators
ranocha Mar 7, 2025
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: 2 additions & 0 deletions src/time_integration/methods_2N.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ function solve!(integrator::SimpleIntegrator2N)
step!(integrator)
end # "main loop" timer

finalize_callbacks(integrator)

return TimeIntegratorSolution((first(prob.tspan), integrator.t),
(prob.u0, integrator.u),
integrator.sol.prob)
Expand Down
2 changes: 2 additions & 0 deletions src/time_integration/methods_3Sstar.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ function solve!(integrator::SimpleIntegrator3Sstar)
step!(integrator)
end # "main loop" timer

finalize_callbacks(integrator)

return TimeIntegratorSolution((first(prob.tspan), integrator.t),
(prob.u0, integrator.u),
integrator.sol.prob)
Expand Down
2 changes: 2 additions & 0 deletions src/time_integration/methods_SSP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ function solve!(integrator::SimpleIntegratorSSP)
finalize_callback(stage_callback, integrator.p)
end

finalize_callbacks(integrator)

return TimeIntegratorSolution((first(prob.tspan), integrator.t),
(prob.u0, integrator.u), prob)
end
Expand Down
2 changes: 2 additions & 0 deletions src/time_integration/paired_explicit_runge_kutta/paired_explicit_runge_kutta.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ function solve!(integrator::AbstractPairedExplicitRKIntegrator)
step!(integrator)
end

finalize_callbacks(integrator)

return TimeIntegratorSolution((first(prob.tspan), integrator.t),
(prob.u0, integrator.u),
integrator.sol.prob)
Expand Down
13 changes: 13 additions & 0 deletions src/time_integration/time_integration.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ function DiffEqBase.get_tstops_max(integrator::AbstractTimeIntegrator)
return maximum(get_tstops_array(integrator))
end

function finalize_callbacks(integrator::AbstractTimeIntegrator)
callbacks = integrator.opts.callback

if callbacks isa CallbackSet
foreach(callbacks.discrete_callbacks) do cb
cb.finalize(cb, integrator.u, integrator.t, integrator)
end
foreach(callbacks.continuous_callbacks) do cb
cb.finalize(cb, integrator.u, integrator.t, integrator)
end
end
end

include("methods_2N.jl")
include("methods_3Sstar.jl")
include("methods_SSP.jl")
Expand Down
Loading