Skip to content

Commit

Permalink
Merge pull request #1070 from AayushSabharwal/as/param-init
Browse files Browse the repository at this point in the history
feat: perform limited DAE initialization for null integrators/solutions
  • Loading branch information
ChrisRackauckas authored Oct 7, 2024
2 parents 6bce332 + 4b2540a commit 78680e1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Printf = "1.9"
RecursiveArrayTools = "3"
Reexport = "1.0"
ReverseDiff = "1"
SciMLBase = "2.53.0"
SciMLBase = "2.56.0"
SciMLOperators = "0.3"
SciMLStructures = "1.5"
Setfield = "1"
Expand Down
10 changes: 9 additions & 1 deletion src/solve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,9 @@ end
function build_null_integrator(prob::AbstractDEProblem, args...;
kwargs...)
sol = solve(prob, args...; kwargs...)
# The DAE initialization in `build_null_solution` may change the parameter
# object `prob.p` via `@set!`, hence use the "new" prob instead of the "old" one.
prob = sol.prob
return NullODEIntegrator{
isinplace(prob), typeof(prob), eltype(prob.tspan), typeof(sol),
typeof(prob.f), typeof(prob.p)
Expand Down Expand Up @@ -675,7 +678,12 @@ function build_null_solution(prob::AbstractDEProblem, args...;
end

timeseries = [Float64[] for i in 1:length(ts)]


if SciMLBase.has_initializeprob(prob.f) && SciMLBase.has_initializeprobpmap(prob.f)
initializeprob = prob.f.initializeprob
nlsol = solve(initializeprob)
@set! prob.p = prob.f.initializeprobpmap(prob, nlsol)
end
build_solution(prob, nothing, ts, timeseries, retcode = ReturnCode.Success)
end

Expand Down

0 comments on commit 78680e1

Please sign in to comment.