Merge pull request #1895 from SciML/myb/connector_type

Handle vector valued variables correctly in get_connection_type

Author: YingboMa

src/systems/connectors.jl

@@ -1,4 +1,10 @@
-get_connection_type(s) = getmetadata(unwrap(s), VariableConnectType, Equality)
+function get_connection_type(s)
+    s = unwrap(s)
+    if istree(s) && operation(s) === getindex
+        s = arguments(s)[1]
+    end
+    getmetadata(s, VariableConnectType, Equality)
+end
 
 function with_connector_type(expr)
     @assert expr isa Expr && (expr.head == :function || (expr.head == :(=) &&

test/stream_connectors.jl

@@ -202,9 +202,19 @@ end
 
 @named simple = ODESystem([connect(vp1, vp2, vp3)], t)
 sys = expand_connections(compose(simple, [vp1, vp2, vp3]))
-@test sort(equations(sys), by = string) == sort([vp1.v[1] ~ vp2.v[1]
+@test sort(equations(sys), by = string) == sort([0 .~ collect(vp1.i)
+            0 .~ collect(vp2.i)
+            0 .~ collect(vp3.i)
+            vp1.v[1] ~ vp2.v[1]
             vp1.v[2] ~ vp2.v[2]
             vp1.v[1] ~ vp3.v[1]
             vp1.v[2] ~ vp3.v[2]
             0 ~ -vp1.i[1] - vp2.i[1] - vp3.i[1]
             0 ~ -vp1.i[2] - vp2.i[2] - vp3.i[2]], by = string)
+
+@connector function VectorHeatPort(; name, N = 100, T0 = 0.0, Q0 = 0.0)
+    @variables (T(t))[1:N]=T0 (Q(t))[1:N]=Q0 [connect = Flow]
+    ODESystem(Equation[], t, [T; Q], []; name = name)
+end
+
+@test_nowarn @named a = VectorHeatPort()