bug added to stream_connectors.jl

Author: Brad Carman

test/stream_connectors.jl

@@ -350,7 +350,37 @@ function StepSource(; P, name)
     ODESystem(eqs, t, vars, pars; name, systems)
 end
 
-function Pipe(; P, R, name)
+function StaticVolume(; P, V, name)
+    D = Differential(t)
+
+    pars = @parameters begin
+        p_int = P
+        vol = V
+    end
+
+    vars = @variables begin
+        p(t) = p_int
+        vrho(t)
+        drho(t) = 0
+    end
+
+    # nodes -------------------------------
+    systems = @named begin H = HydraulicPort(; P = p_int) end
+
+    # fluid props ------------------------
+    rho_0 = H.rho
+
+    # equations ---------------------------
+    eqs = [D(vrho) ~ drho
+           vrho ~ rho_0 * (1 + p / H.bulk)
+           H.p ~ p
+           H.dm ~ drho * V]
+
+    ODESystem(eqs, t, vars, pars; name, systems,
+              defaults = [vrho => rho_0 * (1 + p_int / H.bulk)])
+end
+
+function PipeBase(; P, R, name)
     pars = @parameters begin
         p_int = P
         resistance = R
@@ -371,35 +401,31 @@ function Pipe(; P, R, name)
     ODESystem(eqs, t, vars, pars; name, systems)
 end
 
-function StaticVolume(; P, V, name)
-    D = Differential(t)
+function Pipe(; P, R, name)
 
     pars = @parameters begin
         p_int = P
-        vol = V
+        resistance=R
     end
 
-    vars = @variables begin
-        p(t) = p_int
-        vrho(t)
-        drho(t) = 0
+    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
 
-    # nodes -------------------------------
-    systems = @named begin H = HydraulicPort(; P = p_int) end
+    eqs = [
+           connect(v1.H, p12.HA, HA)
+           connect(v2.H, p12.HB, HB)]
 
-    # fluid props ------------------------
-    rho_0 = H.rho
+    ODESystem(eqs, t, vars, pars; name, systems)
+end
 
-    # equations ---------------------------
-    eqs = [D(vrho) ~ drho
-           vrho ~ rho_0 * (1 + p / H.bulk)
-           H.p ~ p
-           H.dm ~ drho * V]
 
-    ODESystem(eqs, t, vars, pars; name, systems,
-              defaults = [vrho => rho_0 * (1 + p_int / H.bulk)])
-end
 
 function TwoFluidSystem(; name)
     pars = []