Merge pull request #2132 from SciML/bgc/domain_bug

Domain support for relay connections

Author: YingboMa

src/systems/connectors.jl

@@ -430,9 +430,13 @@ function rooted_system_domain_graph(csets::AbstractVector{<:ConnectionSet})
         for (j, s) in enumerate(c.set)
             ij = (i, j)
             push!(id2cset, ij)
-            n = length(id2cset)
+            if !haskey(sys2id, nameof(s))
+                n = length(id2cset)
+                sys2id[nameof(s)] = n
+            else
+                n = sys2id[nameof(s)]
+            end
             push!(cset2id′, n)
-            sys2id[nameof(s)] = n
             is_domain_connector(s.sys.sys) && push!(roots, n)
         end
         push!(cset2id, cset2id′)

test/stream_connectors.jl

@@ -350,27 +350,6 @@ function StepSource(; P, name)
     ODESystem(eqs, t, vars, pars; name, systems)
 end
 
-function Pipe(; P, R, name)
-    pars = @parameters begin
-        p_int = P
-        resistance = R
-    end
-
-    vars = []
-
-    # nodes -------------------------------
-    systems = @named begin
-        HA = HydraulicPort(; P = p_int)
-        HB = HydraulicPort(; P = p_int)
-    end
-
-    # equations ---------------------------
-    eqs = [HA.p - HB.p ~ HA.dm * resistance / HA.viscosity
-           0 ~ HA.dm + HB.dm]
-
-    ODESystem(eqs, t, vars, pars; name, systems)
-end
-
 function StaticVolume(; P, V, name)
     D = Differential(t)
 
@@ -401,6 +380,49 @@ function StaticVolume(; P, V, name)
               defaults = [vrho => rho_0 * (1 + p_int / H.bulk)])
 end
 
+function PipeBase(; P, R, name)
+    pars = @parameters begin
+        p_int = P
+        resistance = R
+    end
+
+    vars = []
+
+    # nodes -------------------------------
+    systems = @named begin
+        HA = HydraulicPort(; P = p_int)
+        HB = HydraulicPort(; P = p_int)
+    end
+
+    # equations ---------------------------
+    eqs = [HA.p - HB.p ~ HA.dm * resistance / HA.viscosity
+           0 ~ HA.dm + HB.dm]
+
+    ODESystem(eqs, t, vars, pars; name, systems)
+end
+
+function Pipe(; P, R, name)
+    pars = @parameters begin
+        p_int = P
+        resistance = R
+    end
+
+    vars = []
+
+    systems = @named begin
+        HA = HydraulicPort(; P = p_int)
+        HB = HydraulicPort(; P = p_int)
+        p12 = PipeBase(; P = p_int, R = resistance)
+        v1 = StaticVolume(; P = p_int, V = 0.01)
+        v2 = StaticVolume(; P = p_int, V = 0.01)
+    end
+
+    eqs = [connect(v1.H, p12.HA, HA)
+           connect(v2.H, p12.HB, HB)]
+
+    ODESystem(eqs, t, vars, pars; name, systems)
+end
+
 function TwoFluidSystem(; name)
     pars = []
     vars = []