Skip to content

Commit

Permalink
Merge branch 'master' into lh/format
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisRackauckas authored Feb 14, 2024
2 parents 4154224 + a5b65e1 commit 3d58032
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DiffEqBase"
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
authors = ["Chris Rackauckas <[email protected]>"]
version = "6.146.2"
version = "6.147.0"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
Expand Down Expand Up @@ -79,7 +79,7 @@ PrecompileTools = "1"
Printf = "1.9"
RecursiveArrayTools = "2, 3"
Reexport = "1.0"
SciMLBase = "2.19.0"
SciMLBase = "2.26.0"
SciMLOperators = "0.2, 0.3"
Setfield = "0.8, 1"
SparseArrays = "1.9"
Expand Down
5 changes: 2 additions & 3 deletions src/callbacks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,8 @@ end
end
integrator.u_modified = true
callback.affect!(integrator)
if integrator.sol.prob isa DAEProblem ||
!(integrator.f.mass_matrix isa UniformScaling)
DiffEqBase.initialize_dae!(integrator)
if integrator.u_modified
reeval_internals_due_to_modification!(integrator, #=continuous_modification=# false)
end
@inbounds if callback.save_positions[2]
savevalues!(integrator, true)
Expand Down

0 comments on commit 3d58032

Please sign in to comment.