Skip to content

Commit f1459e3

Browse files
ven-kChrisRackauckas
authored andcommitted
refactor: Mechanical/MultiBody2D
1 parent 403829e commit f1459e3

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

src/Mechanical/MultiBody2D/components.jl

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
@component function Link(; name, m, l, I, g, x1_0 = 0, y1_0 = 0)
2-
pars = @parameters begin
3-
m = m
4-
l = l
5-
I = I
6-
g = g
7-
x1_0 = x1_0
8-
y1_0 = y1_0
1+
@mtkmodel Link begin
2+
@parameters begin
3+
m
4+
l
5+
I
6+
g
7+
x1_0 = 0.0
8+
y1_0 = 0.0
99
end
1010

11-
vars = @variables begin
11+
@variables begin
1212
(A(t) = 0), [state_priority = 10]
1313
(dA(t) = 0), [state_priority = 10]
1414
(ddA(t) = 0), [state_priority = 10]
@@ -40,13 +40,16 @@
4040
ddy_cm(t) = 0
4141
end
4242

43-
@named TX1 = MechanicalPort()
44-
@named TY1 = MechanicalPort()
43+
@components begin
44+
TX1 = MechanicalPort()
45+
TY1 = MechanicalPort()
4546

46-
@named TX2 = MechanicalPort()
47-
@named TY2 = MechanicalPort()
47+
TX2 = MechanicalPort()
48+
TY2 = MechanicalPort()
49+
end
4850

49-
eqs = [D(A) ~ dA
51+
@equations begin
52+
D(A) ~ dA
5053
D(dA) ~ ddA
5154
D(x1) ~ dx1
5255
D(y1) ~ dy1
@@ -79,8 +82,7 @@
7982
TX2.f ~ fx2
8083
TX2.v ~ dx2
8184
TY2.f ~ fy2
82-
TY2.v ~ dy2]
85+
TY2.v ~ dy2
86+
end
8387

84-
return ODESystem(eqs, t, vars, pars; name = name, systems = [TX1, TY1, TX2, TY2],
85-
defaults = [TX1.v => 0, TY1.v => 0, TX2.v => 0, TY2.v => 0])
8688
end

0 commit comments

Comments
 (0)