Updated mechanical example working

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/hydraulic.jl

@@ -5,8 +5,6 @@ import ModelingToolkitStandardLibrary.Hydraulic.IsothermalCompressible as IC
 import ModelingToolkitStandardLibrary.Blocks as B
 
 
-@parameters t
-
 @component function System(; name)
 
     pars = []
@@ -15,9 +13,9 @@ import ModelingToolkitStandardLibrary.Blocks as B
         fluid = IC.HydraulicFluid(; density = 876, bulk_modulus = 1.2e9, viscosity = 0.034)
 
         stp = B.Step(; height = 10e5, start_time = 0.005)
-        src = IC.InputSource(; p_int = 0)
-        vol = IC.FixedVolume(; p_int = 0, vol = 10.0)
-        res = IC.Tube(5; p_int = 0, area = 0.01, length = 500.0)
+        src = IC.Pressure()
+        vol = IC.FixedVolume(; vol = 10.0)
+        res = IC.Tube(5; area = 0.01, length = 500.0)
     end
 
     eqs = [

examples/mechanical.jl

@@ -4,44 +4,38 @@ using ModelingToolkitDesigner
 using ModelingToolkitStandardLibrary.Blocks
 import ModelingToolkitStandardLibrary.Mechanical.Translational as TV
 
-@parameters t
-D = Differential(t)
+@mtkmodel PassThru3 begin
 
-@component function PassThru3(; name)
-    @variables t
-
-    systems = @named begin
+    @components begin
         p1 = TV.MechanicalPort()
         p2 = TV.MechanicalPort()
         p3 = TV.MechanicalPort()
     end
 
-    eqs = [connect(p1, p2, p3)]
-
-    return ODESystem(eqs, t, [], []; name, systems)
+    @equations begin
+        connect(p1, p2, p3)
+    end
 end
 
-@component function MassSpringDamper(; name)
-    systems = @named begin
-        dv = TV.Damper(d = 1, v_a_0 = 1)
-        sv = TV.Spring(k = 1, v_a_0 = 1, delta_s_0 = 1)
-        bv = TV.Mass(m = 1, v_0 = 1)
+@mtkmodel MassSpringDamper begin
+    @components begin
+        dv = TV.Damper(d = 1)
+        sv = TV.Spring(k = 1)
+        bv = TV.Mass(m = 1)
         gv = TV.Fixed()
 
         pt1 = PassThru3()
         pt2 = PassThru3()
     end
 
-    eqs = [
+    @equations begin
         connect(bv.flange, pt2.p2)
         connect(sv.flange_a, pt2.p1)
         connect(dv.flange_a, pt2.p3)
         connect(dv.flange_b, pt1.p3)
         connect(sv.flange_b, pt1.p1)
         connect(gv.flange, pt1.p2)
-    ]
-
-    return ODESystem(eqs, t, [], []; name, systems)
+    end
 end
 
 @named msd = MassSpringDamper()
@@ -50,7 +44,8 @@ path = joinpath(@__DIR__, "design")
 design = ODESystemDesign(msd, path)
 ModelingToolkitDesigner.view(design)
 
-# using CairoMakie
-# CairoMakie.set_theme!(Theme(;fontsize=12))
-# fig = ModelingToolkitDesigner.view(design, false)
+using CairoMakie
+CairoMakie.set_theme!(Theme(;fontsize=12))
+fig = ModelingToolkitDesigner.view(design, false)
+save(joinpath(@__DIR__, "mechanical.svg"), fig; size=(400,200))
 # save(joinpath(@__DIR__, "mechanical.svg"), fig; resolution=(400,200))