diff --git a/Project.toml b/Project.toml index 37a1ac0..80cbcdf 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ODEInterfaceDiffEq" uuid = "09606e27-ecf5-54fc-bb29-004bd9f985bf" authors = ["Chris Rackauckas "] -version = "4.1.0" +version = "5.0.0" [deps] Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" @@ -17,11 +17,11 @@ SciMLLogging = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1" [compat] Compat = "2.2, 3.0, 4" DataStructures = "0.18, 0.19" -DiffEqBase = "6.217, 7" +DiffEqBase = "7" FunctionWrappers = "1.0" ODEInterface = "0.5" Reexport = "0.2, 1.0" -SciMLBase = "1.73, 2, 3.1" +SciMLBase = "3.1" SciMLLogging = "1.10.1, 2" julia = "1.6" diff --git a/src/initialize.jl b/src/initialize.jl index f72a24d..f88ffbd 100644 --- a/src/initialize.jl +++ b/src/initialize.jl @@ -158,7 +158,7 @@ function DiffEqBase.initialize_dae!( copyto!(old_vals, new_vals) end - integrator.u_modified = true + integrator.derivative_discontinuity = true return nothing end diff --git a/src/integrator_types.jl b/src/integrator_types.jl index ce28b33..d61afe9 100644 --- a/src/integrator_types.jl +++ b/src/integrator_types.jl @@ -17,7 +17,7 @@ mutable struct ODEInterfaceIntegrator{ tprev::Float64 p::P opts::oType - u_modified::Bool + derivative_discontinuity::Bool tdir::Float64 sizeu::SType sol::solType diff --git a/src/integrator_utils.jl b/src/integrator_utils.jl index 432d5d3..9cc0c1a 100644 --- a/src/integrator_utils.jl +++ b/src/integrator_utils.jl @@ -42,7 +42,7 @@ function handle_callbacks!(integrator, eval_sol_fcn) savevalues!(integrator) end - return integrator.u_modified = continuous_modified || discrete_modified + return integrator.derivative_discontinuity = continuous_modified || discrete_modified end function DiffEqBase.savevalues!( @@ -96,7 +96,7 @@ DiffEqBase.get_tmp_cache(i::ODEInterfaceIntegrator, args...) = nothing end @inline function DiffEqBase.u_modified!(integrator::ODEInterfaceIntegrator, bool::Bool) - return integrator.u_modified = bool + return integrator.derivative_discontinuity = bool end # SciMLBase v3 renamed `u_modified!` → `derivative_discontinuity!`. On v3+, @@ -107,7 +107,7 @@ end @inline function SciMLBase.derivative_discontinuity!( integrator::ODEInterfaceIntegrator, bool::Bool ) - return integrator.u_modified = bool + return integrator.derivative_discontinuity = bool end end @@ -115,7 +115,7 @@ function initialize_callbacks!(integrator, initialize_save = true) t = integrator.t u = integrator.u callbacks = integrator.opts.callback - integrator.u_modified = true + integrator.derivative_discontinuity = true u_modified = initialize!(callbacks, u, t, integrator) @@ -131,7 +131,7 @@ function initialize_callbacks!(integrator, initialize_save = true) end # reset this as it is now handled so the integrators should proceed as normal - return integrator.u_modified = false + return integrator.derivative_discontinuity = false end DiffEqBase.set_proposed_dt!(integrator::ODEInterfaceIntegrator, dt) = nothing diff --git a/src/solve.jl b/src/solve.jl index c7bd374..a432451 100644 --- a/src/solve.jl +++ b/src/solve.jl @@ -473,7 +473,7 @@ function (f::OutputFunction)( handle_callbacks!(integrator, eval_sol_fcn) - if integrator.u_modified + if integrator.derivative_discontinuity if eltype(integrator.sol.u) <: Vector u .= integrator.u else