added tests for domain feature

Author: Brad Carman

src/systems/connectors.jl

@@ -262,6 +262,13 @@ function generate_connection_set(sys::AbstractSystem, find = nothing, replace =
     domain_free_connectionsets = filter(connectionsets) do cset
         !any(s -> is_domain_connector(s.sys.sys), cset.set)
     end
+
+    #   Calling merge(connectionsets, true) 
+    #   needs to run with sys expanded equations, if we have more connectionsets then domain_free, then a domain exits, run again...
+    if length(connectionsets) > length(domain_free_connectionsets)
+        # connectionsets_ = ConnectionSet[]
+        sys = generate_connection_set!(connectionsets, sys, find, replace)
+    end
     _, domainset = merge(connectionsets, true)
     sys, (merge(domain_free_connectionsets), domainset)
 end

test/stream_connectors.jl

@@ -3,10 +3,34 @@ using ModelingToolkit
 @variables t
 
 @connector function TwoPhaseFluidPort(; name, P = 0.0, m_flow = 0.0, h_outflow = 0.0)
-    vars = @variables h_outflow(t)=h_outflow [connect = Stream] m_flow(t)=m_flow [
-        connect = Flow,
-    ] P(t)=P
-    ODESystem(Equation[], t, vars, []; name = name)
+    pars = @parameters begin
+        rho
+        bulk
+        viscosity
+    end
+
+    vars = @variables begin
+        (h_outflow(t) = h_outflow), [connect = Stream]
+        (m_flow(t) = m_flow), [connect = Flow]
+        P(t) = P
+    end
+
+    ODESystem(Equation[], t, vars, pars; name = name)
+end
+
+@connector function TwoPhaseFluid(; name, R, B, V)
+    pars = @parameters begin
+        rho = R
+        bulk = B
+        viscosity = V
+    end
+
+    vars = @variables begin m_flow(t), [connect = Flow] end
+
+    # equations ---------------------------
+    eqs = Equation[]
+
+    ODESystem(eqs, t, vars, pars; name)
 end
 
 function MassFlowSource_h(; name,
@@ -90,6 +114,7 @@ function N1M1(; name,
     sys = compose(sys, subs)
 end
 
+@named fluid = TwoPhaseFluid(; R = 876, B = 1.2e9, V = 0.034)
 @named n1m1 = N1M1()
 @named pipe = AdiabaticStraightPipe()
 @named sink = MassFlowSource_h(m_flow_in = -0.01, h_in = 400e3)
@@ -98,7 +123,13 @@ eqns = [connect(n1m1.port_a, pipe.port_a)
         connect(pipe.port_b, sink.port)]
 
 @named sys = ODESystem(eqns, t)
-@named n1m1Test = compose(sys, n1m1, pipe, sink)
+
+eqns = [connect(fluid, n1m1.port_a)
+        connect(n1m1.port_a, pipe.port_a)
+        connect(pipe.port_b, sink.port)]
+
+@named n1m1Test = ODESystem(eqns, t, [], []; systems = [fluid, n1m1, pipe, sink])
+
 @test_nowarn structural_simplify(n1m1Test)
 @unpack source, port_a = n1m1
 @test sort(equations(expand_connections(n1m1)), by = string) == [0 ~ port_a.m_flow
@@ -254,3 +285,192 @@ sys = expand_connections(compose(simple, [vp1, vp2, vp3]))
 end
 
 @test_nowarn @named a = VectorHeatPort()
+
+# --------------------------------------------------
+# Test the new Domain feature
+
+sys_ = expand_connections(n1m1Test)
+sys_defs = ModelingToolkit.defaults(sys_)
+csys = complete(n1m1Test)
+@test Symbol(sys_defs[csys.pipe.port_a.rho]) == Symbol(csys.fluid.rho)
+
+#TODO: This test fails...Is the AdiabaticStraightPipe really a valid component?
+# @test Symbol(sys_defs[csys.pipe.port_b.rho]) == Symbol(csys.fluid.rho)
+
+# Testing the domain feature with non-stream system...
+
+@connector function HydraulicPort(; P, name)
+    pars = @parameters begin
+        p_int = P
+        rho
+        bulk
+        viscosity
+    end
+
+    vars = @variables begin
+        p(t) = p_int
+        dm(t), [connect = Flow]
+    end
+
+    # equations ---------------------------
+    eqs = Equation[]
+
+    ODESystem(eqs, t, vars, pars; name, defaults = [dm => 0])
+end
+
+@connector function Fluid(; name, R, B, V)
+    pars = @parameters begin
+        rho = R
+        bulk = B
+        viscosity = V
+    end
+
+    vars = @variables begin dm(t), [connect = Flow] end
+
+    # equations ---------------------------
+    eqs = Equation[]
+
+    ODESystem(eqs, t, vars, pars; name)
+end
+
+function StepSource(; P, name)
+    pars = @parameters begin p_int = P end
+
+    vars = []
+
+    # nodes -------------------------------
+    systems = @named begin H = HydraulicPort(; P = p_int) end
+
+    # equations ---------------------------
+    eqs = [
+        H.p ~ ifelse(t < 0.1, 0, p_int),
+    ]
+
+    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)
+    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 TwoFluidSystem(; name)
+    pars = []
+    vars = []
+
+    # nodes -------------------------------
+    systems = @named begin
+        fluid_a = Fluid(; R = 876, B = 1.2e9, V = 0.034)
+        source_a = StepSource(; P = 10e5)
+        pipe_a = Pipe(; P = 0, R = 1e6)
+        volume_a = StaticVolume(; P = 0, V = 0.1)
+
+        fluid_b = Fluid(; R = 1000, B = 2.5e9, V = 0.00034)
+        source_b = StepSource(; P = 10e5)
+        pipe_b = Pipe(; P = 0, R = 1e6)
+        volume_b = StaticVolume(; P = 0, V = 0.1)
+    end
+
+    # equations ---------------------------
+    eqs = [connect(fluid_a, source_a.H)
+           connect(source_a.H, pipe_a.HA)
+           connect(pipe_a.HB, volume_a.H)
+           connect(fluid_b, source_b.H)
+           connect(source_b.H, pipe_b.HA)
+           connect(pipe_b.HB, volume_b.H)]
+
+    ODESystem(eqs, t, vars, pars; name, systems)
+end
+
+@named two_fluid_system = TwoFluidSystem()
+sys = expand_connections(two_fluid_system)
+
+sys_defs = ModelingToolkit.defaults(sys)
+csys = complete(two_fluid_system)
+
+@test Symbol(sys_defs[csys.volume_a.H.rho]) == Symbol(csys.fluid_a.rho)
+@test Symbol(sys_defs[csys.volume_b.H.rho]) == Symbol(csys.fluid_b.rho)
+
+@test_nowarn structural_simplify(two_fluid_system)
+
+function OneFluidSystem(; name)
+    pars = []
+    vars = []
+
+    # nodes -------------------------------
+    systems = @named begin
+        fluid = Fluid(; R = 876, B = 1.2e9, V = 0.034)
+
+        source_a = StepSource(; P = 10e5)
+        pipe_a = Pipe(; P = 0, R = 1e6)
+        volume_a = StaticVolume(; P = 0, V = 0.1)
+
+        source_b = StepSource(; P = 20e5)
+        pipe_b = Pipe(; P = 0, R = 1e6)
+        volume_b = StaticVolume(; P = 0, V = 0.1)
+    end
+
+    # equations ---------------------------
+    eqs = [connect(fluid, source_a.H, source_b.H)
+           connect(source_a.H, pipe_a.HA)
+           connect(pipe_a.HB, volume_a.H)
+           connect(source_b.H, pipe_b.HA)
+           connect(pipe_b.HB, volume_b.H)]
+
+    ODESystem(eqs, t, vars, pars; name, systems)
+end
+
+@named one_fluid_system = OneFluidSystem()
+sys = expand_connections(one_fluid_system)
+
+sys_defs = ModelingToolkit.defaults(sys)
+csys = complete(one_fluid_system)
+
+@test Symbol(sys_defs[csys.volume_a.H.rho]) == Symbol(csys.fluid.rho)
+@test Symbol(sys_defs[csys.volume_b.H.rho]) == Symbol(csys.fluid.rho)
+
+@test_nowarn structural_simplify(one_fluid_system)