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

Jump to bottom

Specify Callback Argument Type in init Functions in ODE solvers (2N, 3Sstar, PairedExplicitRK, SSP) #2026

Merged
merged 10 commits into from
Aug 13, 2024
Merged

Specify Callback Argument Type in init Functions in ODE solvers (2N, 3Sstar, PairedExplicitRK, SSP) #2026

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c4b2d4
Update function signatures to include type annotations for callback p…
warisa-r Jul 29, 2024
b7d7557
Merge branch 'main' into specify_init_arg_type_integrator
warisa-r Jul 29, 2024
a1d9526
Update error messages for unsupported continuous callbacks in time in…
warisa-r Jul 29, 2024
9d916c0
Merge branch 'specify_init_arg_type_integrator' of https://github.com…
warisa-r Jul 29, 2024
c9af78e
Update error messages for unsupported continuous callbacks in time in…
warisa-r Jul 29, 2024
586ec89
Update src/time_integration/methods_2N.jl
warisa-r Jul 29, 2024
3bf7b9d
Update src/time_integration/methods_3Sstar.jl
warisa-r Jul 29, 2024
1518654
change error message in ssp integrator
warisa-r Aug 10, 2024
3f75f9f
Merge branch 'main' into specify_init_arg_type_integrator
warisa-r Aug 10, 2024
2c8f2e5
fix error message in ssp
warisa-r Aug 10, 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
6 changes: 2 additions & 4 deletions src/time_integration/methods_2N.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function Base.getproperty(integrator::SimpleIntegrator2N, field::Symbol)
end

function init(ode::ODEProblem, alg::SimpleAlgorithm2N;
dt, callback = nothing, kwargs...)
dt, callback::Union{CallbackSet, Nothing} = nothing, kwargs...)
u = copy(ode.u0)
du = similar(u)
u_tmp = similar(u)
Expand All @@ -119,13 +119,11 @@ function init(ode::ODEProblem, alg::SimpleAlgorithm2N;
# initialize callbacks
if callback isa CallbackSet
foreach(callback.continuous_callbacks) do cb
error("unsupported")
throw(ArgumentError("Continuous callbacks are unsupported with the low-storage RK method (Carpenter, Kennedy 1994, 4th order, Solution 3)."))
warisa-r marked this conversation as resolved.
Show resolved Hide resolved
end
foreach(callback.discrete_callbacks) do cb
cb.initialize(cb, integrator.u, integrator.t, integrator)
end
elseif !isnothing(callback)
error("unsupported")
end

return integrator
Expand Down
6 changes: 2 additions & 4 deletions src/time_integration/methods_3Sstar.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function Base.getproperty(integrator::SimpleIntegrator3Sstar, field::Symbol)
end

function init(ode::ODEProblem, alg::SimpleAlgorithm3Sstar;
dt, callback = nothing, kwargs...)
dt, callback::Union{CallbackSet, Nothing} = nothing, kwargs...)
u = copy(ode.u0)
du = similar(u)
u_tmp1 = similar(u)
Expand All @@ -189,13 +189,11 @@ function init(ode::ODEProblem, alg::SimpleAlgorithm3Sstar;
# initialize callbacks
if callback isa CallbackSet
foreach(callback.continuous_callbacks) do cb
error("unsupported")
throw(ArgumentError("Continuous callbacks are unsupported with the 2nd order, 5-stage explicit Runge-Kutta scheme."))
warisa-r marked this conversation as resolved.
Show resolved Hide resolved
end
foreach(callback.discrete_callbacks) do cb
cb.initialize(cb, integrator.u, integrator.t, integrator)
end
elseif !isnothing(callback)
error("unsupported")
end

return integrator
Expand Down
6 changes: 2 additions & 4 deletions src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function Base.getproperty(integrator::PairedExplicitRK, field::Symbol)
end

function init(ode::ODEProblem, alg::PairedExplicitRK2;
dt, callback = nothing, kwargs...)
dt, callback::Union{CallbackSet, Nothing} = nothing, kwargs...)
u0 = copy(ode.u0)
du = zero(u0)
u_tmp = zero(u0)
Expand All @@ -286,13 +286,11 @@ function init(ode::ODEProblem, alg::PairedExplicitRK2;
# initialize callbacks
if callback isa CallbackSet
for cb in callback.continuous_callbacks
error("unsupported")
throw(ArgumentError("Continuous callbacks are unsupported with paired explicit Runge-Kutta methods."))
end
for cb in callback.discrete_callbacks
cb.initialize(cb, integrator.u, integrator.t, integrator)
end
elseif !isnothing(callback)
error("unsupported")
end

return integrator
Expand Down
Loading