@@ -136,27 +136,28 @@ eqns = [domain_connect(fluid, n1m1.port_a)
136
136
137
137
@test_nowarn structural_simplify (n1m1Test)
138
138
@unpack source, port_a = n1m1
139
- @test sort (equations (expand_connections (n1m1)), by = string) == [0 ~ port_a. m_flow
139
+ ssort (eqs) = sort (eqs, by = string)
140
+ @test ssort (equations (expand_connections (n1m1))) == ssort ([0 ~ port_a. m_flow
140
141
0 ~ source. port1. m_flow - port_a. m_flow
141
142
source. port1. P ~ port_a. P
142
143
source. port1. P ~ source. P
143
144
source. port1. h_outflow ~ port_a. h_outflow
144
- source. port1. h_outflow ~ source. h]
145
+ source. port1. h_outflow ~ source. h])
145
146
@unpack port_a, port_b = pipe
146
- @test sort (equations (expand_connections (pipe)), by = string ) ==
147
- [0 ~ - port_a. m_flow - port_b. m_flow
147
+ @test ssort (equations (expand_connections (pipe))) ==
148
+ ssort ( [0 ~ - port_a. m_flow - port_b. m_flow
148
149
0 ~ port_a. m_flow
149
150
0 ~ port_b. m_flow
150
151
port_a. P ~ port_b. P
151
152
port_a. h_outflow ~ instream (port_b. h_outflow)
152
- port_b. h_outflow ~ instream (port_a. h_outflow)]
153
- @test sort (equations (expand_connections (sys)), by = string ) ==
154
- [0 ~ n1m1. port_a. m_flow + pipe. port_a. m_flow
153
+ port_b. h_outflow ~ instream (port_a. h_outflow)])
154
+ @test ssort (equations (expand_connections (sys))) ==
155
+ ssort ( [0 ~ n1m1. port_a. m_flow + pipe. port_a. m_flow
155
156
0 ~ pipe. port_b. m_flow + sink. port. m_flow
156
157
n1m1. port_a. P ~ pipe. port_a. P
157
- pipe. port_b. P ~ sink. port. P]
158
- @test sort (equations (expand_connections (n1m1Test)), by = string ) ==
159
- [0 ~ - pipe. port_a. m_flow - pipe. port_b. m_flow
158
+ pipe. port_b. P ~ sink. port. P])
159
+ @test ssort (equations (expand_connections (n1m1Test))) ==
160
+ ssort ( [0 ~ - pipe. port_a. m_flow - pipe. port_b. m_flow
160
161
0 ~ n1m1. source. port1. m_flow - n1m1. port_a. m_flow
161
162
0 ~ n1m1. port_a. m_flow + pipe. port_a. m_flow
162
163
0 ~ pipe. port_b. m_flow + sink. port. m_flow
@@ -172,7 +173,7 @@ eqns = [domain_connect(fluid, n1m1.port_a)
172
173
pipe. port_b. h_outflow ~ n1m1. port_a. h_outflow
173
174
sink. port. P ~ sink. P
174
175
sink. port. h_outflow ~ sink. h_in
175
- sink. port. m_flow ~ - sink. m_flow_in]
176
+ sink. port. m_flow ~ - sink. m_flow_in])
176
177
177
178
# N1M2 model and test code.
178
179
function N1M2 (; name,
@@ -255,12 +256,12 @@ eqns = [connect(source.port, n2m2.port_a)
255
256
@named sp2 = TwoPhaseFluidPort ()
256
257
@named sys = ODESystem ([connect (sp1, sp2)], t)
257
258
sys_exp = expand_connections (compose (sys, [sp1, sp2]))
258
- @test sort (equations (sys_exp), by = string ) == [0 ~ - sp1. m_flow - sp2. m_flow
259
+ @test ssort (equations (sys_exp)) == ssort ( [0 ~ - sp1. m_flow - sp2. m_flow
259
260
0 ~ sp1. m_flow
260
261
0 ~ sp2. m_flow
261
262
sp1. P ~ sp2. P
262
263
sp1. h_outflow ~ ModelingToolkit. instream (sp2. h_outflow)
263
- sp2. h_outflow ~ ModelingToolkit. instream (sp1. h_outflow)]
264
+ sp2. h_outflow ~ ModelingToolkit. instream (sp1. h_outflow)])
264
265
265
266
# array var
266
267
@connector function VecPin (; name)
@@ -274,15 +275,15 @@ end
274
275
275
276
@named simple = ODESystem ([connect (vp1, vp2, vp3)], t)
276
277
sys = expand_connections (compose (simple, [vp1, vp2, vp3]))
277
- @test sort (equations (sys), by = string ) == sort ([0 .~ collect (vp1. i)
278
- 0 .~ collect (vp2. i)
279
- 0 .~ collect (vp3. i)
280
- vp1. v[1 ] ~ vp2. v[1 ]
281
- vp1. v[2 ] ~ vp2. v[2 ]
282
- vp1. v[1 ] ~ vp3. v[1 ]
283
- vp1. v[2 ] ~ vp3. v[2 ]
284
- 0 ~ - vp1. i[1 ] - vp2. i[1 ] - vp3. i[1 ]
285
- 0 ~ - vp1. i[2 ] - vp2. i[2 ] - vp3. i[2 ]], by = string )
278
+ @test ssort (equations (sys)) == ssort ([0 .~ collect (vp1. i)
279
+ 0 .~ collect (vp2. i)
280
+ 0 .~ collect (vp3. i)
281
+ vp1. v[1 ] ~ vp2. v[1 ]
282
+ vp1. v[2 ] ~ vp2. v[2 ]
283
+ vp1. v[1 ] ~ vp3. v[1 ]
284
+ vp1. v[2 ] ~ vp3. v[2 ]
285
+ 0 ~ - vp1. i[1 ] - vp2. i[1 ] - vp3. i[1 ]
286
+ 0 ~ - vp1. i[2 ] - vp2. i[2 ] - vp3. i[2 ]])
286
287
287
288
@connector function VectorHeatPort (; name, N = 100 , T0 = 0.0 , Q0 = 0.0 )
288
289
@variables (T (t))[1 : N]= T0 (Q (t))[1 : N]= Q0 [connect = Flow]
0 commit comments