Skip to content

Commit 8584bc3

Browse files
authored
Merge pull request #196 from JuliaComputing/no_mtkmodel
WIP use MTK compiler
2 parents 8e3f8c1 + a22b95d commit 8584bc3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2105
-1310
lines changed

Project.toml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,55 @@ version = "0.3.2"
77
CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
88
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
99
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
10-
JuliaSimCompiler = "8391cb6b-4921-5777-4e45-fd9aab8cb88d"
1110
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1211
MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118"
1312
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
1413
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
14+
OrdinaryDiffEqNonlinearSolve = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
15+
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
16+
OrdinaryDiffEqTsit5 = "b1df2697-797e-41e3-8120-5422d3b24e4a"
1517
Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
1618
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1719
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1820

1921
[weakdeps]
20-
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
22+
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
2123
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
2224
LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
23-
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
25+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
2426
MetaGraphsNext = "fa8bd995-216d-47f1-8a91-f3b68fbeb377"
2527

26-
2728
[extensions]
2829
Render = ["Makie"]
2930
URDF = ["LightXML", "Graphs", "MetaGraphsNext", "JuliaFormatter"]
3031

3132
[compat]
3233
CoordinateTransformations = "0.6"
33-
DataInterpolations = "5, 6"
34+
DataInterpolations = "8"
3435
FileIO = "1"
3536
Graphs = "1.0"
3637
JuliaFormatter = "1.0"
37-
JuliaSimCompiler = "0.1.12"
3838
LightXML = "0.9"
3939
LinearAlgebra = "1.6"
40-
MeshIO = "0.4"
40+
MeshIO = "0.4, 0.5"
4141
MetaGraphsNext = "0.7"
42-
ModelingToolkit = "9"
42+
ModelingToolkit = "10"
4343
ModelingToolkitStandardLibrary = "2.7.2"
44+
OrdinaryDiffEqNonlinearSolve = "1.14.1"
45+
OrdinaryDiffEqRosenbrock = "1.17.0"
46+
OrdinaryDiffEqTsit5 = "1.5.0"
4447
Rotations = "1.4"
4548
SparseArrays = "1"
4649
StaticArrays = "1"
4750
julia = "1"
4851

4952
[extras]
50-
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
51-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
53+
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
5254
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
5355
LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
54-
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
5556
MetaGraphsNext = "fa8bd995-216d-47f1-8a91-f3b68fbeb377"
57+
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
58+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5659

5760
[targets]
5861
test = ["OrdinaryDiffEq", "Test", "JuliaFormatter", "LightXML", "Graphs", "MetaGraphsNext"]

docs/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
33
ControlSystemsMTK = "687d7614-c7e5-45fc-bfc3-9ee385575c88"
44
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
55
GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
6-
JuliaSimCompiler = "8391cb6b-4921-5777-4e45-fd9aab8cb88d"
76
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
87
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
98
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"

docs/src/examples/free_motion.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This example demonstrates how a free-floating [`Body`](@ref) can be simulated. T
55
using Multibody
66
using ModelingToolkit
77
using Plots
8-
using JuliaSimCompiler
8+
# using JuliaSimCompiler
99
using OrdinaryDiffEq
1010
1111
t = Multibody.t
@@ -18,7 +18,7 @@ world = Multibody.world
1818
eqs = [connect(world.frame_b, freeMotion.frame_a)
1919
connect(freeMotion.frame_b, body.frame_a)]
2020
21-
@named model = ODESystem(eqs, t,
21+
@named model = System(eqs, t,
2222
systems = [world;
2323
freeMotion;
2424
body])
@@ -60,7 +60,7 @@ eqs = [connect(bar2.frame_a, world.frame_b)
6060
connect(spring1.frame_a, world.frame_b)
6161
connect(body.frame_b, spring2.frame_b)]
6262
63-
@named model = ODESystem(eqs, t,
63+
@named model = System(eqs, t,
6464
systems = [
6565
world,
6666
body,

docs/src/examples/gearbox.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The [`GearConstraint`](@ref) has two rotational axes which do not have to be par
1010
using Multibody
1111
using ModelingToolkit
1212
using Plots
13-
using JuliaSimCompiler
13+
# using JuliaSimCompiler
1414
using OrdinaryDiffEq
1515
1616
t = Multibody.t
@@ -46,7 +46,7 @@ eqs = [connect(world.frame_b, gearConstraint.bearing)
4646
connect(mounting1D.flange_b, torque2.support)
4747
connect(fixed.frame_b, mounting1D.frame_a)]
4848
49-
@named model = ODESystem(eqs, t, systems = [world; systems])
49+
@named model = System(eqs, t, systems = [world; systems])
5050
cm = complete(model)
5151
ssys = structural_simplify(multibody(model))
5252
prob = ODEProblem(ssys, [

docs/src/examples/gyroscopic_effects.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The system consists of a pendulum suspended in a spherical joint, a joint withou
1111
using Multibody
1212
using ModelingToolkit
1313
using Plots
14-
using JuliaSimCompiler
14+
# using JuliaSimCompiler
1515
using OrdinaryDiffEq
1616
1717
t = Multibody.t
@@ -36,7 +36,7 @@ connections = [
3636
connect(trans.frame_b, body2.frame_a)
3737
]
3838
39-
@named model = ODESystem(connections, t, systems = [world; systems])
39+
@named model = System(connections, t, systems = [world; systems])
4040
model = complete(model)
4141
ssys = structural_simplify(multibody(model))
4242

docs/src/examples/kinematic_loops.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import ModelingToolkitStandardLibrary.Mechanical.Rotational
2929
using Plots
3030
using OrdinaryDiffEq
3131
using LinearAlgebra
32-
using JuliaSimCompiler
32+
# using JuliaSimCompiler
3333
3434
t = Multibody.t
3535
D = Differential(t)
@@ -73,7 +73,7 @@ connections = [
7373
connect(j2.support, damper2.flange_b)
7474
7575
]
76-
@named fourbar = ODESystem(connections, t, systems = [world; systems])
76+
@named fourbar = System(connections, t, systems = [world; systems])
7777
fourbar = complete(fourbar)
7878
ssys = structural_simplify(multibody(fourbar))
7979
prob = ODEProblem(ssys, [fourbar.j1.phi => 0.1], (0.0, 10.0))
@@ -144,7 +144,7 @@ connections = [connect(j2.frame_b, b2.frame_a)
144144
connect(b0.frame_a, world.frame_b)
145145
connect(b0.frame_b, j2.frame_a)
146146
]
147-
@named fourbar2 = ODESystem(connections, t, systems = [world; systems])
147+
@named fourbar2 = System(connections, t, systems = [world; systems])
148148
fourbar2 = complete(fourbar2)
149149
ssys = structural_simplify(multibody(fourbar2))
150150
@@ -185,7 +185,7 @@ connections = [connect(j2.frame_b, b2.frame_a)
185185
connect(b3.frame_b, j2.frame_a)
186186
]
187187
188-
@named fourbar_analytic = ODESystem(connections, t, systems = [world; systems])
188+
@named fourbar_analytic = System(connections, t, systems = [world; systems])
189189
fourbar_analytic = complete(fourbar_analytic)
190190
ssys_analytic = structural_simplify(multibody(fourbar_analytic))
191191
prob = ODEProblem(ssys_analytic, [], (0.0, 1.4399))

0 commit comments

Comments
 (0)