Merge pull request #1 from matthew-kapp/update-examples

Updated examples to match MTK v9 macros syntax

Author: matthew-kapp

Project.toml

@@ -10,6 +10,7 @@ FilterHelpers = "d8f44d74-4a63-4059-add9-16c5740a0809"
 GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
+Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 
 [compat]
@@ -19,6 +20,7 @@ FilterHelpers = "0.2"
 GLMakie = "0.9, 0.10"
 ModelingToolkit = "8,9"
 ModelingToolkitStandardLibrary = "2"
+Revise = "3.7.2"
 TOML = "1"
 julia = "1.6"
 

examples/electrical.jl

@@ -1,45 +1,45 @@
 using ModelingToolkit
+# using ModelingToolkit: t_nounits as t
 using ModelingToolkitStandardLibrary.Electrical
 using ModelingToolkitStandardLibrary.Blocks: Constant
 using ModelingToolkitDesigner
 using CairoMakie
 using GLMakie
 
-@component function PassThru2(; name)
-    @variables t
+@mtkmodel PassThru2 begin
 
-    systems = @named begin
+    @components begin
         p1 = Pin()
         p2 = Pin()
     end
 
-    eqs = [connect(p1, p2)]
-
-    return ODESystem(eqs, t, [], []; name, systems)
+    @equations begin
+        connect(p1, p2)
+    end
 end
 
-@component function PassThru3(; name)
-    @variables t
+@mtkmodel PassThru3 begin
 
-    systems = @named begin
+    @components begin
         p1 = Pin()
         p2 = Pin()
         p3 = Pin()
     end
 
-    eqs = [connect(p1, p2, p3)]
-
-    return ODESystem(eqs, t, [], []; name, systems)
+    @equations begin
+        connect(p1, p2, p3)
+    end
 end
 
-@component function Circuit(; name)
+@mtkmodel Circuit begin
 
-    R = 1.0
-    C = 1.0
-    V = 1.0
-    @variables t
+    @parameters begin
+        R = 1.0
+        C = 1.0
+        V = 1.0
+    end
 
-    systems = @named begin
+    @components begin
         resistor = Resistor(R = R)
         capacitor = Capacitor(C = C)
         source = Voltage()
@@ -49,36 +49,32 @@ end
         pt3 = PassThru3()
     end
 
-    eqs = [
+    @equations begin
         connect(resistor.p, pt2.p1)
         connect(source.p, pt2.p2)
         connect(source.n, pt3.p2)
         connect(capacitor.n, pt3.p1)
         connect(resistor.n, capacitor.p)
         connect(ground.g, pt3.p3)
         connect(source.V, constant.output)
-    ]
-
-    # eqs = [connect(constant.output, source.V)
-    #         connect(source.p, resistor.p)
-    #         connect(resistor.n, capacitor.p)
-    #         connect(capacitor.n, source.n, ground.g)]
+    end
 
-    ODESystem(eqs, t, [], []; systems, name)
+    # @equations begin
+    #     connect(constant.output, source.V)
+    #     connect(source.p, resistor.p)
+    #     connect(resistor.n, capacitor.p)
+    #     connect(capacitor.n, source.n, ground.g)
+    # end
 end
 
 @named rc = Circuit()
 
-# using OrdinaryDiffEq
-# sys = structural_simplify(rc)
-# prob = ODEProblem(sys, Pair[], (0, 10.0))
-# sol = solve(prob, Tsit5())
-
 path = joinpath(@__DIR__, "design")
 design = ODESystemDesign(rc, path)
 GLMakie.set_theme!(Theme(; fontsize = 12))
 ModelingToolkitDesigner.view(design)
 
-# CairoMakie.set_theme!(Theme(;fontsize=12))
-# fig = ModelingToolkitDesigner.view(design, false)
+CairoMakie.set_theme!(Theme(;fontsize=12))
+fig = ModelingToolkitDesigner.view(design, false)
+save(joinpath(@__DIR__, "electrical.svg"), fig; size=(300,300))
 # save(joinpath(@__DIR__, "electrical.svg"), fig; resolution=(300,300))