Skip to content

Commit eda23d4

Browse files
Merge pull request #3227 from AayushSabharwal/as/daeprob-init
fix: propagate `initializeprobpmap` and `update_initializeprob!` to `DAEFunction`
2 parents f3caa10 + 5b702ca commit eda23d4

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,8 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
498498
checkbounds = false,
499499
initializeprob = nothing,
500500
initializeprobmap = nothing,
501+
initializeprobpmap = nothing,
502+
update_initializeprob! = nothing,
501503
kwargs...) where {iip}
502504
if !iscomplete(sys)
503505
error("A completed system is required. Call `complete` or `structural_simplify` on the system before creating a `DAEFunction`")
@@ -551,7 +553,9 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
551553
jac_prototype = jac_prototype,
552554
observed = observedfun,
553555
initializeprob = initializeprob,
554-
initializeprobmap = initializeprobmap)
556+
initializeprobmap = initializeprobmap,
557+
initializeprobpmap = initializeprobpmap,
558+
update_initializeprob! = update_initializeprob!)
555559
end
556560

557561
function DiffEqBase.DDEFunction(sys::AbstractODESystem, args...; kwargs...)

test/initializationsystem.jl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,3 +958,20 @@ end
958958
@test_warn ["structurally singular", "initialization", "Guess", "heuristic"] ODEProblem(
959959
pend, [x => 1, y => 0], (0.0, 1.5), [g => 1], guesses ==> 1])
960960
end
961+
962+
@testset "DAEProblem initialization" begin
963+
@variables x(t) [guess = 1.0] y(t) [guess = 1.0]
964+
@parameters p=missing [guess = 1.0] q=missing [guess = 1.0]
965+
@mtkbuild sys = ODESystem(
966+
[D(x) ~ p * y + q * t, x^3 + y^3 ~ 5], t; initialization_eqs = [p^2 + q^3 ~ 3])
967+
968+
# FIXME: solve for du0
969+
prob = DAEProblem(
970+
sys, [D(x) => cbrt(4), D(y) => -1 / cbrt(4)], [x => 1.0], (0.0, 1.0), [p => 1.0])
971+
972+
integ = init(prob, DImplicitEuler())
973+
@test integ[x] 1.0
974+
@test integ[y]cbrt(4) rtol=1e-6
975+
@test integ.ps[p] 1.0
976+
@test integ.ps[q]cbrt(2) rtol=1e-6
977+
end

0 commit comments

Comments
 (0)