Skip to content

Commit 59432e6

Browse files
committed
Hydraulic library updated to use macros
Changes include: - sources.jl - MassFlow(; name, p_int) - FixedPressure(; p, name) - Pressure(; name) - components.jl - Cap(; p_int, name) - Open(; p_int, name) -
1 parent 7dd7cba commit 59432e6

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

src/Hydraulic/IsothermalCompressible/components.jl

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,24 @@ Caps a hydraulic port to prevent mass flow in or out.
1010
# Connectors:
1111
- `port`: hydraulic port
1212
"""
13-
@component function Cap(; name)
14-
vars = @variables p(t), [guess = 0]
13+
@mtkmodel Cap begin
1514

16-
systems = @named begin
15+
@parameters begin
16+
end
17+
18+
@variables begin
19+
p(t), [guess = 0]
20+
end
21+
22+
@components begin
1723
port = HydraulicPort()
1824
end
1925

20-
eqs = [port.p ~ p
21-
port.dm ~ 0]
26+
@equations begin
27+
port.p ~ p
28+
port.dm ~ 0
29+
end
2230

23-
ODESystem(eqs, t, vars, []; name, systems)
2431
end
2532

2633
"""
@@ -34,22 +41,25 @@ Provides an "open" boundary condition for a hydraulic port such that mass flow `
3441
# Connectors:
3542
- `port`: hydraulic port
3643
"""
37-
@component function Open(; name)
38-
pars = []
44+
@mtkmodel Open begin
45+
46+
@parameters begin
47+
end
3948

40-
vars = @variables begin
49+
@variables begin
4150
p(t), [guess = 0]
4251
dm(t), [guess = 0]
4352
end
4453

45-
systems = @named begin
54+
@components begin
4655
port = HydraulicPort()
4756
end
4857

49-
eqs = [port.p ~ p
50-
port.dm ~ dm]
58+
@equations begin
59+
port.p ~ p
60+
port.dm ~ dm
61+
end
5162

52-
ODESystem(eqs, t, vars, pars; name, systems)
5363
end
5464

5565
"""

0 commit comments

Comments
 (0)