Skip to content

Make CheckInit the default for ODEs and DAEs: breaking #2602

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
29 changes: 4 additions & 25 deletions lib/OrdinaryDiffEqCore/src/initialize_dae.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,38 +42,17 @@ function DiffEqBase.initialize_dae!(integrator::ODEIntegrator,
Val(DiffEqBase.isinplace(integrator.sol.prob)))
end

## Default algorithms
## Default algorithm is CheckInit
## Changed in v7--previously was BrownFullBasicInit or ShampineCollocationInit

function _initialize_dae!(integrator, prob::ODEProblem,
function _initialize_dae!(integrator, prob::Union{ODEProblem, DAEProblem},
alg::DefaultInit, x::Union{Val{true}, Val{false}})
if SciMLBase.has_initializeprob(prob.f)
_initialize_dae!(integrator, prob,
OverrideInit(integrator.opts.abstol), x)
elseif !applicable(_initialize_dae!, integrator, prob,
BrownFullBasicInit(integrator.opts.abstol), x)
error("`OrdinaryDiffEqNonlinearSolve` is not loaded, which is required for the default initialization algorithm (`BrownFullBasicInit` or `ShampineCollocationInit`). To solve this problem, either do `using OrdinaryDiffEqNonlinearSolve` or pass `initializealg = CheckInit()` to the `solve` function. This second option requires consistent `u0`.")
else
_initialize_dae!(integrator, prob,
BrownFullBasicInit(integrator.opts.abstol), x)
end
end

function _initialize_dae!(integrator, prob::DAEProblem,
alg::DefaultInit, x::Union{Val{true}, Val{false}})
if SciMLBase.has_initializeprob(prob.f)
_initialize_dae!(integrator, prob,
OverrideInit(integrator.opts.abstol), x)
elseif !applicable(_initialize_dae!, integrator, prob,
BrownFullBasicInit(), x) &&
!applicable(_initialize_dae!,
integrator, prob, ShampineCollocationInit(), x)
error("`OrdinaryDiffEqNonlinearSolve` is not loaded, which is required for the default initialization algorithm (`BrownFullBasicInit` or `ShampineCollocationInit`). To solve this problem, either do `using OrdinaryDiffEqNonlinearSolve` or pass `initializealg = CheckInit()` to the `solve` function. This second option requires consistent `u0`.")
elseif prob.differential_vars === nothing
_initialize_dae!(integrator, prob,
ShampineCollocationInit(), x)
else
_initialize_dae!(integrator, prob,
BrownFullBasicInit(integrator.opts.abstol), x)
CheckInit(), x)
end
end

Expand Down
Loading