Skip to content

Format #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Hydraulic/IsothermalCompressible/components.jl
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ dm ────► │ │ area

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

@named moving_volume = VolumeBase(; p_int, x_int = 0, area, dead_volume = 0, Χ1 = 0, Χ2 = 1)
@named moving_volume = VolumeBase(;
p_int,
x_int = 0,
area,
dead_volume = 0,
Χ1 = 0,
Χ2 = 1)

volumes = []
for i in 1:N
Expand Down Expand Up @@ -581,8 +587,6 @@ dm ────► │ │ area
defaults = [flange.v => 0])
end



@component function SpoolValve(reversible = false; p_a_int, p_b_int, x_int, Cd, d, name)
pars = @parameters begin
p_a_int = p_a_int
Expand Down
2 changes: 1 addition & 1 deletion src/Mechanical/Translational/components.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Use to close a system that has un-connected `MechanicalPort`'s where the force s
@named flange = MechanicalPort()
vars = @variables f(t) = 0
eqs = [
flange.f ~ f
flange.f ~ f,
]
return compose(ODESystem(eqs, t, vars, []; name, defaults = [flange.v => 0]),
flange)
Expand Down
23 changes: 9 additions & 14 deletions src/Mechanical/Translational/sources.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Linear 1D position input source
- `flange`: 1-dim. translational flange
- `s`: real input
"""
@component function Position(solves_force=true; s_0 = 0, name)
@component function Position(solves_force = true; s_0 = 0, name)
systems = @named begin
flange = MechanicalPort()
s = RealInput()
Expand All @@ -45,18 +45,15 @@ Linear 1D position input source
pars = @parameters s_0 = s_0
vars = @variables x(t) = s_0

eqs = [
D(x) ~ flange.v
s.u ~ x
]
eqs = [D(x) ~ flange.v
s.u ~ x]

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

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


@component function Velocity(solves_force=true; name)
@component function Velocity(solves_force = true; name)
systems = @named begin
flange = MechanicalPort()
v = RealInput()
Expand All @@ -66,16 +63,15 @@ end
vars = []

eqs = [
v.u ~ flange.v
]
v.u ~ flange.v,
]

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

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


@component function Acceleration(solves_force=true; s_0 = 0, name)
@component function Acceleration(solves_force = true; s_0 = 0, name)
systems = @named begin
flange = MechanicalPort()
a = RealInput()
Expand All @@ -84,11 +80,10 @@ end
pars = []
vars = @variables v(t) = 0

eqs = [
v ~ flange.v
eqs = [v ~ flange.v
D(v) ~ a.u]

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

ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0])
end
end
4 changes: 2 additions & 2 deletions src/Mechanical/Translational/utils.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@connector function MechanicalPort(; name, f_int=0, v_int=0)
@connector function MechanicalPort(; name, f_int = 0, v_int = 0)
pars = @parameters begin
f_int = f_int
v_int = v_int
Expand All @@ -7,7 +7,7 @@
v(t) = v_int
f(t), [connect = Flow]
end
ODESystem(Equation[], t, vars, pars; name, defaults=[f=>f_int])
ODESystem(Equation[], t, vars, pars; name, defaults = [f => f_int])
end
Base.@doc """
MechanicalPort(;name)
Expand Down
2 changes: 1 addition & 1 deletion test/Mechanical/translational.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ D = Differential(t)
end

eqs = [connect(a.output, acc.a)
connect(mass.flange, acc.flange, free.flange)]
connect(mass.flange, acc.flange, free.flange)]

ODESystem(eqs, t, [], []; name, systems)
end
Expand Down