Merge pull request #3156 from AayushSabharwal/as/varmap-partial-eval

fix: only evaluate required keys of varmap in `process_SciMLProblem`

Author: ChrisRackauckas

src/systems/problem_utils.jl

@@ -301,12 +301,14 @@ end
 """
     $(TYPEDSIGNATURES)
 
-Performs symbolic substitution on the values in `varmap`, using `varmap` itself as the
-set of substitution rules. 
-"""
-function evaluate_varmap!(varmap::AbstractDict)
-    for (k, v) in varmap
-        varmap[k] = fixpoint_sub(v, varmap)
+Performs symbolic substitution on the values in `varmap` for the keys in `vars`, using
+`varmap` itself as the set of substitution rules. If an entry in `vars` is not a key
+in `varmap`, it is ignored.
+"""
+function evaluate_varmap!(varmap::AbstractDict, vars)
+    for k in vars
+        haskey(varmap, k) || continue
+        varmap[k] = fixpoint_sub(varmap[k], varmap)
     end
 end
 
@@ -499,7 +501,7 @@ function process_SciMLProblem(
     add_observed!(sys, op)
     add_parameter_dependencies!(sys, op)
 
-    evaluate_varmap!(op)
+    evaluate_varmap!(op, dvs)
 
     u0 = better_varmap_to_vars(
         op, dvs; tofloat = true, use_union = false,
@@ -511,6 +513,7 @@ function process_SciMLProblem(
 
     check_eqs_u0(eqs, dvs, u0; check_length, kwargs...)
 
+    evaluate_varmap!(op, ps)
     if is_split(sys)
         p = MTKParameters(sys, op)
     else

test/initial_values.jl

@@ -136,3 +136,16 @@ end
     prob = @test_nowarn ODEProblem(sys, [], (0.0, 1.0))
     @test prob.p isa Vector{Float64}
 end
+
+@testset "Issue#3153" begin
+    @variables x(t) y(t)
+    @parameters c1 c2 c3
+    eqs = [D(x) ~ y,
+        y ~ ifelse(t < c1, 0.0, (-c1 + t)^(c3))]
+    sps = [x, y]
+    ps = [c1, c2, c3]
+    @mtkbuild osys = ODESystem(eqs, t, sps, ps)
+    u0map = [x => 1.0]
+    pmap = [c1 => 5.0, c2 => 1.0, c3 => 1.2]
+    oprob = ODEProblem(osys, u0map, (0.0, 10.0), pmap)
+end