Skip to content

Commit

Permalink
Merge pull request #2212 from ven-k/vkb/msl-2-updates
Browse files Browse the repository at this point in the history
Update the `Torque` and `Mass` components wrt to MSL-2.0
  • Loading branch information
ChrisRackauckas authored Jul 20, 2023
2 parents 24d0d7c + b0b1c3a commit eabda48
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/inputoutput.jl
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ c = 10 # Damping coefficient
@named inertia2 = Inertia(; J = m2)
@named spring = Spring(; c = k)
@named damper = Damper(; d = c)
@named torque = Torque()
@named torque = Torque(; use_support = false)
eqs = [connect(torque.flange, inertia1.flange_a)
connect(inertia1.flange_b, spring.flange_a, damper.flange_a)
Expand Down
4 changes: 2 additions & 2 deletions test/input_output_handling.jl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ t = ModelingToolkitStandardLibrary.Mechanical.Rotational.t
@named inertia2 = Inertia(; J = 1)
@named spring = Spring(; c = 10)
@named damper = Damper(; d = 3)
@named torque = Torque()
@named torque = Torque(; use_support = false)
@variables y(t) = 0
eqs = [connect(torque.flange, inertia1.flange_a)
connect(inertia1.flange_b, spring.flange_a, damper.flange_a)
Expand Down Expand Up @@ -264,7 +264,7 @@ c = 10 # Damping coefficient
@named inertia2 = Rotational.Inertia(; J = m2)
@named spring = Rotational.Spring(; c = k)
@named damper = Rotational.Damper(; d = c)
@named torque = Rotational.Torque()
@named torque = Rotational.Torque(; use_support = false)

function SystemModel(u = nothing; name = :model)
eqs = [connect(torque.flange, inertia1.flange_a)
Expand Down
2 changes: 1 addition & 1 deletion test/linearize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ if VERSION >= v"1.8"
D = Differential(t)

@named link1 = Link(; m = 0.2, l = 10, I = 1, g = -9.807)
@named cart = Translational.Mass(; m = 1, s_0 = 0)
@named cart = Translational.Mass(; m = 1, s = 0)
@named fixed = Fixed()
@named force = Force()

Expand Down

0 comments on commit eabda48

Please sign in to comment.