Skip to content

Commit 4ec8af3

Browse files
Merge pull request #271 from AayushSabharwal/as/mtk-v9
refactor: update for compatibility with MTKv9
2 parents 2da69d3 + 27c1a1d commit 4ec8af3

37 files changed

+71
-124
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DataInterpolations = "4"
1919
DiffEqBase = "6.103"
2020
IfElse = "0.1"
2121
LinearAlgebra = "1.10"
22-
ModelingToolkit = "8.69"
22+
ModelingToolkit = "9"
2323
OrdinaryDiffEq = "6.33"
2424
SafeTestsets = "0.1"
2525
Symbolics = "5.2"

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ ControlSystemsBase = "1.1"
1313
DifferentialEquations = "7.6"
1414
Documenter = "1"
1515
IfElse = "0.1"
16-
ModelingToolkit = "8.67"
16+
ModelingToolkit = "9"
1717
OrdinaryDiffEq = "6.31"
1818
Plots = "1.36"

docs/src/connectors/connections.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ As can be seen, this will give a 1 equation model matching our energy dissipatio
9090

9191
```@example connections
9292
using ModelingToolkitStandardLibrary.Electrical, ModelingToolkit, DifferentialEquations
93+
using ModelingToolkit: t_nounits as t
9394
using Plots
9495
95-
@parameters t
96-
9796
@named resistor = Resistor(R = 1)
9897
@named capacitor = Capacitor(C = 1)
9998
@named ground = Ground()

docs/src/tutorials/custom_component.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ First, we need to make some imports.
88

99
```@example components
1010
using ModelingToolkit
11+
using ModelingToolkit: t_nounits as t
1112
using ModelingToolkitStandardLibrary.Electrical
1213
using ModelingToolkitStandardLibrary.Electrical: OnePort
1314
using OrdinaryDiffEq
@@ -35,8 +36,6 @@ end NonlinearResistor;
3536
this can almost be directly translated to the syntax of `ModelingToolkit`.
3637

3738
```@example components
38-
@parameters t
39-
4039
function NonlinearResistor(; name, Ga, Gb, Ve)
4140
@named oneport = OnePort()
4241
@unpack v, i = oneport

docs/src/tutorials/dc_motor_pi.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ First, the needed packages are imported and the parameters of the model defined.
1414

1515
```@example dc_motor_pi
1616
using ModelingToolkit
17+
using ModelingToolkit: t_nounits as t
1718
using ModelingToolkitStandardLibrary.Electrical
1819
using ModelingToolkitStandardLibrary.Mechanical.Rotational
1920
using ModelingToolkitStandardLibrary.Blocks
2021
using OrdinaryDiffEq
2122
using Plots
2223
23-
@parameters t
24-
2524
R = 0.5 # [Ohm] armature resistance
2625
L = 4.5e-3 # [H] armature inductance
2726
k = 0.5 # [N.m/A] motor constant

docs/src/tutorials/input_component.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ The `ModelingToolkitStandardLibrary.Blocks.TimeVaryingFunction` component is eas
1414

1515
```julia
1616
using ModelingToolkit
17+
using ModelingToolkit: t_nounits as t, D_nounits as D
1718
using ModelingToolkitStandardLibrary.Blocks
1819
using DataInterpolations
1920
using OrdinaryDiffEq
2021

21-
@parameters t
22-
D = Differential(t)
23-
2422
function System(f; name)
2523
src = TimeVaryingFunction(f)
2624

docs/src/tutorials/rc_circuit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rc_eqs = [connect(constant.output, source.V)
2929
@named rc_model = ODESystem(rc_eqs, t,
3030
systems = [resistor, capacitor, constant, source, ground])
3131
sys = structural_simplify(rc_model)
32-
prob = ODAEProblem(sys, Pair[], (0, 10.0))
32+
prob = ODEProblem(sys, Pair[], (0, 10.0))
3333
sol = solve(prob, Tsit5())
3434
plot(sol, idxs = [capacitor.v, resistor.i],
3535
title = "RC Circuit Demonstration",

docs/src/tutorials/thermal_model.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ from dividing the total initial energy in the system by the sum of the heat capa
88

99
```@example
1010
using ModelingToolkitStandardLibrary.Thermal, ModelingToolkit, OrdinaryDiffEq, Plots
11-
12-
@parameters t
11+
using ModelingToolkit: t_nounits as t
1312
1413
C1 = 15
1514
C2 = 15

src/Blocks/Blocks.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ module Blocks
55
using ModelingToolkit, Symbolics
66
import IfElse: ifelse
77
import ..@symcheck
8-
using ModelingToolkit: getdefault
9-
10-
@parameters t
11-
D = Differential(t)
8+
using ModelingToolkit: getdefault, t_nounits as t, D_nounits as D
129

1310
export RealInput, RealOutput, SISO
1411
include("utils.jl")

src/Blocks/continuous.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@ See also [`StateSpace`](@ref) which handles MIMO systems, as well as [ControlSys
620620

621621
x = collect(x)
622622
x_scaled = collect(x_scaled)
623+
bb = collect(bb)
623624

624625
sts = [x; x_scaled; y; u]
625626

0 commit comments

Comments
 (0)