Skip to content

Commit 7dd7cba

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

File tree

2 files changed

+32
-23
lines changed

2 files changed

+32
-23
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ docs/site/
2222
# committed for packages, but should be committed for applications that require a static
2323
# environment.
2424
Manifest.toml
25+
26+
27+
src/Hydraulic/changes.md

src/Hydraulic/IsothermalCompressible/sources.jl

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ Hydraulic mass flow input source
88
- `port`: hydraulic port
99
- `dm`: real input
1010
"""
11-
@component function MassFlow(; name)
12-
pars = []
11+
@mtkmodel MassFlow begin
12+
13+
@parameters begin
14+
end
15+
16+
@variables begin
17+
end
1318

14-
systems = @named begin
19+
@components begin
1520
port = HydraulicPort()
1621
dm = RealInput()
1722
end
1823

19-
vars = []
20-
eqs = [
24+
@equations begin
2125
port.dm ~ -dm.u
22-
]
23-
24-
ODESystem(eqs, t, vars, pars; name, systems)
26+
end
2527
end
2628

2729
"""
@@ -35,22 +37,23 @@ Fixed pressure source
3537
# Connectors:
3638
- `port`: hydraulic port
3739
"""
38-
@component function FixedPressure(; p, name)
39-
pars = @parameters begin
40-
p = p
40+
@mtkmodel FixedPressure begin
41+
42+
@parameters begin
43+
p
4144
end
4245

43-
vars = []
46+
@variables begin
47+
end
4448

45-
systems = @named begin
49+
@components begin
4650
port = HydraulicPort()
4751
end
4852

49-
eqs = [
53+
@equations begin
5054
port.p ~ p
51-
]
55+
end
5256

53-
ODESystem(eqs, t, vars, pars; name, systems)
5457
end
5558
@deprecate Source FixedPressure
5659

@@ -63,19 +66,22 @@ input pressure source
6366
- `port`: hydraulic port
6467
- `p`: real input
6568
"""
66-
@component function Pressure(; name)
67-
pars = []
68-
vars = []
69+
@mtkmodel Pressure begin
70+
71+
@parameters begin
72+
end
6973

70-
systems = @named begin
74+
@variables begin
75+
end
76+
77+
@components begin
7178
port = HydraulicPort()
7279
p = RealInput()
7380
end
7481

75-
eqs = [
82+
@equations begin
7683
port.p ~ p.u
77-
]
84+
end
7885

79-
ODESystem(eqs, t, vars, pars; name, systems)
8086
end
8187
@deprecate InputSource Pressure

0 commit comments

Comments
 (0)