fix params

Author: shashi

src/ModelingToolkit.jl

@@ -49,7 +49,7 @@ import Symbolics: rename, get_variables!, _solve, hessian_sparsity,
                   ParallelForm, SerialForm, MultithreadedForm, build_function,
                   unflatten_long_ops, rhss, lhss, prettify_expr, gradient,
                   jacobian, hessian, derivative, sparsejacobian, sparsehessian,
-                  substituter
+                  substituter, scalarize
 
 import DiffEqBase: @add_kwonly
 

src/parameters.jl

@@ -21,6 +21,16 @@ Maps the variable to a state.
 tovar(s::Symbolic) = setmetadata(s, MTKParameterCtx, false)
 tovar(s::Num) = Num(tovar(value(s)))
 
+function recurse_and_apply(f, x)
+    if symtype(x) <: AbstractArray
+        getindex_posthook(x) do r,x,i...
+            recurse_and_apply(f, r)
+        end
+    else
+        f(x)
+    end
+end
+
 """
 $(SIGNATURES)
 
@@ -31,6 +41,6 @@ macro parameters(xs...)
                           Real,
                           xs,
                           x -> x isa AbstractArray ?
-                              Symbolics.getindex_posthook((a, b...)->toparam(a), x) : toparam(x)
+                          Symbolics.recurse_and_apply(toparam, x) : toparam(x),
                          ) |> esc
 end

src/systems/diffeqs/odesystem.jl

@@ -85,9 +85,9 @@ function ODESystem(
                    defaults=_merge(Dict(default_u0), Dict(default_p)),
                    connection_type=nothing,
                   )
-    iv′ = value(iv)
-    dvs′ = value.(collect(dvs))
-    ps′ = value.(collect(ps))
+    iv′ = value(scalarize(iv))
+    dvs′ = value.(scalarize(dvs))
+    ps′ = value.(scalarize(ps))
 
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn("`default_u0` and `default_p` are deprecated. Use `defaults` instead.", :ODESystem, force=true)