Merge branch 'master' into myb/vis

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Yingbo Ma <mayingbo5@gmail.com>", "Chris Rackauckas <accounts@chrisrackauckas.com> and contributors"]
-version = "8.62.0"
+version = "8.63.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/inputoutput.jl

@@ -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)

src/systems/model_parsing.jl

@@ -48,7 +48,8 @@ function connector_macro(mod, name, body)
         error("$name doesn't have a independent variable")
     end
     gui_metadata = isassigned(icon) ? GUIMetadata(GlobalRef(mod, name), icon[]) :
-                   nothing
+                   GUIMetadata(GlobalRef(mod, name))
+
     quote
         $name = $Model((; name, $(kwargs...)) -> begin
                 $expr
@@ -229,7 +230,7 @@ function mtkmodel_macro(mod, name, expr)
     end
 
     gui_metadata = isassigned(icon) > 0 ? GUIMetadata(GlobalRef(mod, name), icon[]) :
-                   nothing
+                   GUIMetadata(GlobalRef(mod, name))
 
     sys = :($ODESystem($Equation[$(eqs...)], $iv, [$(vs...)], [$(ps...)];
         systems = [$(comps...)], name, gui_metadata = $gui_metadata)) #, defaults = $defaults))

test/input_output_handling.jl

@@ -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)
@@ -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)

test/linearize.jl

@@ -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()