Skip to content

Commit bfc080e

Browse files
authored
Fix deprecation (#614)
* Replace u_modified by derivative_discontinuity * Remove u_modified! entirely
1 parent 1c3a2d4 commit bfc080e

6 files changed

Lines changed: 7 additions & 16 deletions

File tree

src/JumpProcesses.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ using DiffEqBase: DiffEqBase, CallbackSet, ContinuousCallback, DAEFunction,
3939
DDEFunction, DiscreteProblem, ODEFunction, ODEProblem,
4040
ODESolution, ReturnCode, SDEFunction, SDEProblem, add_tstop!,
4141
deleteat!, isinplace, remake, savevalues!, step!,
42-
u_modified!
42+
derivative_discontinuity!
4343
using SciMLBase: SciMLBase, DEIntegrator
4444

4545
abstract type AbstractJump end

src/SSA_stepper.jl

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,10 @@ function Base.propertynames(integrator::SSAIntegrator, private::Bool = false)
136136
return (fieldnames(SSAIntegrator)..., :derivative_discontinuity)
137137
end
138138

139-
function DiffEqBase.u_modified!(integrator::SSAIntegrator, bool::Bool)
139+
function SciMLBase.derivative_discontinuity!(integrator::SSAIntegrator, bool::Bool)
140140
integrator.u_modified = bool
141141
end
142142

143-
# SciMLBase v3 renamed `u_modified!` to `derivative_discontinuity!` and internal
144-
# callback code now calls the new name. Define the method when available so
145-
# callbacks keep working on v3. Guarded so the file still loads on v2.
146-
@static if isdefined(SciMLBase, :derivative_discontinuity!)
147-
function SciMLBase.derivative_discontinuity!(integrator::SSAIntegrator, bool::Bool)
148-
integrator.u_modified = bool
149-
end
150-
end
151-
152143
function SciMLBase.__solve(jump_prob::JumpProblem, alg::SSAStepper; kwargs...)
153144
# init will handle kwargs merging via init_call
154145
integrator = init(jump_prob, alg; kwargs...)

src/aggregators/coevolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function accept_next_jump!(p::CoevolveJumpAggregation, integrator, u, params, t)
220220
p.prev_jump = next_jump
221221
generate_jumps!(p, integrator, integrator.u, integrator.p, integrator.t)
222222
register_next_jump_time!(integrator, p, integrator.t)
223-
u_modified!(integrator, false)
223+
derivative_discontinuity!(integrator, false)
224224

225225
return false
226226
end

src/aggregators/ssajump.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function (p::AbstractSSAJumpAggregator)(dj, u, t, integrator) # initialize
6565
concretize_affects!(p, integrator)
6666
initialize!(p, integrator, u, integrator.p, t)
6767
register_next_jump_time!(integrator, p, integrator.t)
68-
u_modified!(integrator, false)
68+
derivative_discontinuity!(integrator, false)
6969
nothing
7070
end
7171

src/variable_rate.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ end
211211
# initialize: (cb, u, t, integrator)
212212
function (c::VR_FRMEventCallback)(cb, u, t, integrator)
213213
integrator.u.jump_u[c.idx] = -randexp(c.rng, typeof(integrator.t))
214-
u_modified!(integrator, true)
214+
derivative_discontinuity!(integrator, true)
215215
nothing
216216
end
217217

@@ -372,7 +372,7 @@ end
372372
function initialize_vr_direct_wrapper(cb::ContinuousCallback, u, t, integrator)
373373
concretize_vr_direct_affects!(cb.condition, integrator)
374374
initialize_vr_direct_cache!(cb.condition, u, t, integrator)
375-
u_modified!(integrator, false)
375+
derivative_discontinuity!(integrator, false)
376376
nothing
377377
end
378378

test/variable_rate.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ let
611611
function switch_affect!(integ)
612612
integ.u[1] = max(round(integ.u[1]), 0.0)
613613
integ.p.mode = :SSA
614-
u_modified!(integ, true)
614+
derivative_discontinuity!(integ, true)
615615
reset_aggregated_jumps!(integ)
616616
end
617617
switch_cb = ContinuousCallback(switch_cond, switch_affect!)

0 commit comments

Comments
 (0)