Use schedule to replace dummy derivatives

Author: hersle

src/systems/diffeqs/abstractodesystem.jl

@@ -1366,7 +1366,19 @@ function InitializationProblem{iip, specialize}(sys::AbstractSystem,
     end
 
     u0map = merge(ModelingToolkit.guesses(sys), todict(guesses), todict(u0map))
-    u0map = Dict(diff2term(var) => val for (var, val) in u0map) # replace D(x) -> x_t etc.
+
+    # Replace dummy derivatives in u0map: D(x) -> x_t etc.
+    schedule = get_schedule(sys)
+    if !isnothing(schedule)
+        for (var, val) in u0map
+            dvar = get(schedule.dummy_sub, var, var) # with dummy derivatives
+            if dvar !== var # then replace it
+                delete!(u0map, var)
+                push!(u0map, dvar => val)
+            end
+        end
+    end
+
     fullmap = merge(u0map, parammap)
     u0T = Union{}
     for sym in unknowns(isys)