Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion lib/ModelingToolkitBase/src/systems/problem_utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,13 @@ function evaluate_varmap!(
ir::IRStructure{SymReal}, varmap::AtomicArrayDictSubstitutionWrapper, vars;
limit = 100, allow_symbolic = false
)
subber = Symbolics.FixpointSubstituter(SU.IRSubstituter{true}(ir, varmap); maxiters = limit, warn_maxiters = !allow_symbolic)
# Use `FPSubFilterer{Nothing}` so substitution descends into operator calls such as
# `Initial`, matching the generic `fixpoint_sub` path. The default IR filterer treats
# operators as atomic, leaving `Initial`-dependent guesses unresolved.
subber = Symbolics.FixpointSubstituter(
SU.IRSubstituter{true}(ir, varmap; filterer = Symbolics.FPSubFilterer{Nothing}());
maxiters = limit, warn_maxiters = !allow_symbolic
)
for k in vars
v = get(varmap, k, COMMON_NOTHING)
v === COMMON_NOTHING && continue
Expand Down
18 changes: 18 additions & 0 deletions lib/ModelingToolkitBase/test/initializationsystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1610,6 +1610,24 @@ end
@test integ1[X1] ≈ 1.0
end

@testset "Initial-dependent array parameter guesses" begin
@variables X1(t) X2(t)
@parameters k1 k2 Γ[1:1] = missing [guess = [Initial(X1 + X2)]]
eqs = [D(X1) ~ k1 * (Γ[1] - X1) - k2 * X1]
@named osys = System(
eqs, t, [X1], [k1, k2, Γ]; observed = [X2 ~ Γ[1] - X1]
)
osys = complete(osys)
prob = ODEProblem(
osys,
[X1 => 1.0, X2 => 2.0, k1 => 0.1, k2 => 0.2],
(0.0, 1.0)
)

@test prob[X2] == 2.0
@test prob.ps[Γ[1]] == 3.0
end

if @isdefined(ModelingToolkit)
@testset "Trivial initialization is run on problem construction" begin
@variables _x(..) y(t)
Expand Down
Loading