Skip to content

feat: allow initialization of null integrators #2228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

feat: allow initialization of null integrators #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3790eb0
fix: remake initialization problem during DAE initialization
AayushSabharwal May 22, 2024
bcaffaa
feat: allow initialization of null integrators
AayushSabharwal May 28, 2024
a2cb472
fixup! feat: allow initialization of null integrators
AayushSabharwal May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SparseDiffTools = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"

[compat]
Expand Down Expand Up @@ -84,6 +85,7 @@ SparseArrays = "1.9"
SparseDiffTools = "2.3"
StaticArrayInterface = "1.2"
StaticArrays = "1.0"
SymbolicIndexingInterface = "0.3.16"
TruncatedStacktraces = "1.2"
julia = "1.10"

Expand Down
2 changes: 2 additions & 0 deletions src/OrdinaryDiffEq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ using ExponentialUtilities

using NonlinearSolve

using SymbolicIndexingInterface

# Required by temporary fix in not in-place methods with 12+ broadcasts
# `MVector` is used by Nordsieck forms
import StaticArrays: SArray, MVector, SVector, @SVector, StaticArray, MMatrix, SA
Expand Down
21 changes: 16 additions & 5 deletions src/initialize_dae.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ function DiffEqBase.initialize_dae!(integrator::ODEIntegrator,
Val(DiffEqBase.isinplace(integrator.sol.prob)))
end

function DiffEqBase.initialize_dae!(integrator::DiffEqBase.NullODEIntegrator)
_initialize_dae!(integrator, integrator.sol.prob,
OverrideInit(),
Val(DiffEqBase.isinplace(integrator.sol.prob)))
end

## Default algorithms

function _initialize_dae!(integrator, prob::ODEProblem,
Expand Down Expand Up @@ -134,19 +140,24 @@ end
function _initialize_dae!(integrator, prob::Union{ODEProblem, DAEProblem},
alg::OverrideInit, isinplace::Union{Val{true}, Val{false}})
initializeprob = prob.f.initializeprob

prob.f.initializeprob_init!(initializeprob, integrator)
# If it doesn't have autodiff, assume it comes from symbolic system like ModelingToolkit
# Since then it's the case of not a DAE but has initializeprob
# In which case, it should be differentiable
isAD = has_autodiff(integrator.alg) ? alg_autodiff(integrator.alg) isa AutoForwardDiff :
true
isAD = if !isdefined(integrator, :alg)
false
elseif has_autodiff(integrator.alg)
alg_autodiff(integrator.alg) isa AutoForwardDiff
else
true
end

alg = default_nlsolve(alg.nlsolve, isinplace, initializeprob.u0, initializeprob, isAD)
nlsol = solve(initializeprob, alg)
if isinplace === Val{true}()
integrator.u .= prob.f.initializeprobmap(nlsol)
prob.f.initializeprob_update!(integrator, nlsol)
elseif isinplace === Val{false}()
integrator.u = prob.f.initializeprobmap(nlsol)
prob.f.initializeprob_update!(integrator, nlsol)
else
error("Unreachable reached. Report this error.")
end
Expand Down