diff --git a/Project.toml b/Project.toml index c65441f2..8184b14e 100644 --- a/Project.toml +++ b/Project.toml @@ -20,6 +20,7 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RandomNumbers = "e6cf234a-135c-5ec9-84dd-332b85af5143" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" @@ -48,6 +49,7 @@ Logging = "1.6" MuladdMacro = "0.2.1" NLsolve = "4" OrdinaryDiffEq = "6.87" +OrdinaryDiffEqCore = "1" Random = "1.6" RandomNumbers = "1.5.3" RecursiveArrayTools = "2, 3" diff --git a/src/StochasticDiffEq.jl b/src/StochasticDiffEq.jl index b946d200..91f2ed29 100644 --- a/src/StochasticDiffEq.jl +++ b/src/StochasticDiffEq.jl @@ -58,6 +58,8 @@ using OrdinaryDiffEq: nlsolvefail, isnewton, set_new_W!, get_W, _vec, _reshape using OrdinaryDiffEq: NLSolver +import OrdinaryDiffEqCore + if isdefined(OrdinaryDiffEq,:FastConvergence) using OrdinaryDiffEq: FastConvergence, Convergence, SlowConvergence, VerySlowConvergence, Divergence diff --git a/src/initialize_dae.jl b/src/initialize_dae.jl index a1cbbc29..947e3aa5 100644 --- a/src/initialize_dae.jl +++ b/src/initialize_dae.jl @@ -1,14 +1,14 @@ struct SDEDefaultInit <: DiffEqBase.DAEInitializationAlgorithm end function DiffEqBase.initialize_dae!(integrator::SDEIntegrator, initializealg = integrator.initializealg) - OrdinaryDiffEq._initialize_dae!(integrator, integrator.sol.prob, initializealg, Val(DiffEqBase.isinplace(integrator.sol.prob))) + OrdinaryDiffEqCore._initialize_dae!(integrator, integrator.sol.prob, initializealg, Val(DiffEqBase.isinplace(integrator.sol.prob))) end -function OrdinaryDiffEq._initialize_dae!(integrator::SDEIntegrator, prob, ::SDEDefaultInit, isinplace) +function OrdinaryDiffEqCore._initialize_dae!(integrator::SDEIntegrator, prob, ::SDEDefaultInit, isinplace) if SciMLBase.has_initializeprob(prob.f) - OrdinaryDiffEq._initialize_dae!(integrator, prob, SciMLBase.OverrideInit(), isinplace) + OrdinaryDiffEqCore._initialize_dae!(integrator, prob, SciMLBase.OverrideInit(), isinplace) else - OrdinaryDiffEq._initialize_dae!(integrator, prob, SciMLBase.CheckInit(), isinplace) + OrdinaryDiffEqCore._initialize_dae!(integrator, prob, SciMLBase.CheckInit(), isinplace) end end