Skip to content

Commit c553c28

Browse files
Fix kwargshandling from prob
1 parent 859d0d1 commit c553c28

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/solve.jl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,12 @@ function Base.showerror(io::IO, e::IncompatibleMassMatrixError)
450450
println(io, TruncatedStacktraces.VERBOSE_MSG)
451451
end
452452

453-
function init_call(_prob, args...; merge_callbacks = true, kwargshandle = KeywordArgError,
453+
function init_call(_prob, args...; merge_callbacks = true, kwargshandle = nothing,
454454
kwargs...)
455+
456+
kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
457+
kwargshandle = has_kwargs(_prob) && haskey(_prob.kwargs, :kwargshandle) ? _prob.kwargs[:kwargshandle] : kwargshandle
458+
455459
if has_kwargs(_prob)
456460
if merge_callbacks && haskey(_prob.kwargs, :callback) && haskey(kwargs, :callback)
457461
kwargs_temp = NamedTuple{
@@ -526,8 +530,12 @@ function init_up(prob::DEProblem, sensealg, u0, p, args...; kwargs...)
526530
end
527531
end
528532

529-
function solve_call(_prob, args...; merge_callbacks = true, kwargshandle = KeywordArgError,
533+
function solve_call(_prob, args...; merge_callbacks = true, kwargshandle = nothing,
530534
kwargs...)
535+
536+
kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
537+
kwargshandle = has_kwargs(_prob) && haskey(_prob.kwargs, :kwargshandle) ? _prob.kwargs[:kwargshandle] : kwargshandle
538+
531539
if has_kwargs(_prob)
532540
if merge_callbacks && haskey(_prob.kwargs, :callback) && haskey(kwargs, :callback)
533541
kwargs_temp = NamedTuple{

0 commit comments

Comments
 (0)