Skip to content

Commit 5c2f60b

Browse files
committed
Format
1 parent 77d57f0 commit 5c2f60b

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

src/Hydraulic/IsothermalCompressible/components.jl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ dm ────► │ │ area
506506

507507
ports = @named begin
508508
port = HydraulicPort(; p_int)
509-
flange = MechanicalPort(; f_int = p_int*area)
509+
flange = MechanicalPort(; f_int = p_int * area)
510510
damper = ValveBase(; p_a_int = p_int, p_b_int = p_int, area_int = 1, Cd,
511511
Cd_reverse, minimum_area)
512512
end
@@ -528,7 +528,13 @@ dm ────► │ │ area
528528
Δx = ParentScope(x_max) / N
529529
x₀ = ParentScope(x_int)
530530

531-
@named moving_volume = VolumeBase(; p_int, x_int = 0, area, dead_volume = 0, Χ1 = 0, Χ2 = 1)
531+
@named moving_volume = VolumeBase(;
532+
p_int,
533+
x_int = 0,
534+
area,
535+
dead_volume = 0,
536+
Χ1 = 0,
537+
Χ2 = 1)
532538

533539
volumes = []
534540
for i in 1:N
@@ -581,8 +587,6 @@ dm ────► │ │ area
581587
defaults = [flange.v => 0])
582588
end
583589

584-
585-
586590
@component function SpoolValve(reversible = false; p_a_int, p_b_int, x_int, Cd, d, name)
587591
pars = @parameters begin
588592
p_a_int = p_a_int

src/Mechanical/Translational/components.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Use to close a system that has un-connected `MechanicalPort`'s where the force s
1111
@named flange = MechanicalPort()
1212
vars = @variables f(t) = 0
1313
eqs = [
14-
flange.f ~ f
14+
flange.f ~ f,
1515
]
1616
return compose(ODESystem(eqs, t, vars, []; name, defaults = [flange.v => 0]),
1717
flange)

src/Mechanical/Translational/sources.jl

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linear 1D position input source
3636
- `flange`: 1-dim. translational flange
3737
- `s`: real input
3838
"""
39-
@component function Position(solves_force=true; s_0 = 0, name)
39+
@component function Position(solves_force = true; s_0 = 0, name)
4040
systems = @named begin
4141
flange = MechanicalPort()
4242
s = RealInput()
@@ -45,18 +45,15 @@ Linear 1D position input source
4545
pars = @parameters s_0 = s_0
4646
vars = @variables x(t) = s_0
4747

48-
eqs = [
49-
D(x) ~ flange.v
50-
s.u ~ x
51-
]
48+
eqs = [D(x) ~ flange.v
49+
s.u ~ x]
5250

5351
!solves_force && push!(eqs, 0 ~ flange.f)
5452

5553
ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0, s.u => s_0])
5654
end
5755

58-
59-
@component function Velocity(solves_force=true; name)
56+
@component function Velocity(solves_force = true; name)
6057
systems = @named begin
6158
flange = MechanicalPort()
6259
v = RealInput()
@@ -66,16 +63,15 @@ end
6663
vars = []
6764

6865
eqs = [
69-
v.u ~ flange.v
70-
]
66+
v.u ~ flange.v,
67+
]
7168

7269
!solves_force && push!(eqs, 0 ~ flange.f)
7370

7471
ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0])
7572
end
7673

77-
78-
@component function Acceleration(solves_force=true; s_0 = 0, name)
74+
@component function Acceleration(solves_force = true; s_0 = 0, name)
7975
systems = @named begin
8076
flange = MechanicalPort()
8177
a = RealInput()
@@ -84,11 +80,10 @@ end
8480
pars = []
8581
vars = @variables v(t) = 0
8682

87-
eqs = [
88-
v ~ flange.v
83+
eqs = [v ~ flange.v
8984
D(v) ~ a.u]
9085

9186
!solves_force && push!(eqs, 0 ~ flange.f)
9287

9388
ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0])
94-
end
89+
end

src/Mechanical/Translational/utils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@connector function MechanicalPort(; name, f_int=0, v_int=0)
1+
@connector function MechanicalPort(; name, f_int = 0, v_int = 0)
22
pars = @parameters begin
33
f_int = f_int
44
v_int = v_int
@@ -7,7 +7,7 @@
77
v(t) = v_int
88
f(t), [connect = Flow]
99
end
10-
ODESystem(Equation[], t, vars, pars; name, defaults=[f=>f_int])
10+
ODESystem(Equation[], t, vars, pars; name, defaults = [f => f_int])
1111
end
1212
Base.@doc """
1313
MechanicalPort(;name)

test/Mechanical/translational.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ D = Differential(t)
1717
end
1818

1919
eqs = [connect(a.output, acc.a)
20-
connect(mass.flange, acc.flange, free.flange)]
20+
connect(mass.flange, acc.flange, free.flange)]
2121

2222
ODESystem(eqs, t, [], []; name, systems)
2323
end

0 commit comments

Comments
 (0)