fix: use new varmap_to_vars

Author: AayushSabharwal

src/systems/problem_utils.jl

@@ -1211,8 +1211,8 @@ Keyword arguments:
 - `fully_determined`: Override whether the initialization system is fully determined.
 - `check_initialization_units`: Enable or disable unit checks when constructing the
   initialization problem.
-- `tofloat`, `is_initializeprob`: Passed to [`better_varmap_to_vars`](@ref) for building `u0` (and possibly `p`).
-- `u0_constructor`: A function to apply to the `u0` value returned from `better_varmap_to_vars`
+- `tofloat`, `is_initializeprob`: Passed to [`varmap_to_vars`](@ref) for building `u0` (and possibly `p`).
+- `u0_constructor`: A function to apply to the `u0` value returned from `varmap_to_vars`
   to construct the final `u0` value.
 - `p_constructor`: A function to apply to each array buffer created when constructing the parameter object.
 - `du0map`: A map of derivatives to values. See `implicit_dae`.
@@ -1333,11 +1333,10 @@ function process_SciMLProblem(
             @warn "Cycles in unknowns:\n$msg"
         end
     end
-    evaluate_varmap!(op, dvs; limit = substitution_limit)
 
-    u0 = better_varmap_to_vars(
-        op, dvs; tofloat, floatT,
-        container_type = u0Type, allow_symbolic = symbolic_u0, is_initializeprob)
+    u0 = varmap_to_vars(
+        op, dvs; tofloat, floatT, container_type = u0Type, allow_symbolic = symbolic_u0,
+        is_initializeprob, substitution_limit)
 
     if u0 !== nothing
         u0 = u0_constructor(u0)
@@ -1358,15 +1357,15 @@ function process_SciMLProblem(
             @warn "Cycles in parameters:\n$msg"
         end
     end
-    evaluate_varmap!(op, ps; limit = substitution_limit)
+
     if is_split(sys)
         # `pType` is usually `Dict` when the user passes key-value pairs.
         if !(pType <: AbstractArray)
             pType = Array
         end
         p = MTKParameters(sys, op; floatT = floatT, p_constructor)
     else
-        p = p_constructor(better_varmap_to_vars(op, ps; tofloat, container_type = pType))
+        p = p_constructor(varmap_to_vars(op, ps; tofloat, container_type = pType))
     end
 
     if implicit_dae && du0map !== nothing

test/discrete_system.jl

@@ -37,7 +37,7 @@ syss = structural_simplify(sys)
 df = DiscreteFunction(syss)
 # iip
 du = zeros(3)
-u = ModelingToolkit.better_varmap_to_vars(
+u = ModelingToolkit.varmap_to_vars(
     Dict([S(k - 1) => 1, I(k - 1) => 2, R(k - 1) => 3]), unknowns(syss))
 p = MTKParameters(syss, [c, nsteps, δt, β, γ] .=> collect(1:5))
 df.f(du, u, p, 0)