refactor: Blocks/utils.jl (limited)

Author: ven-k

src/Blocks/Blocks.jl

@@ -5,6 +5,7 @@ module Blocks
 using ModelingToolkit, Symbolics
 using IfElse: ifelse
 import ..@symcheck
+using ModelingToolkit: getdefault
 
 @parameters t
 D = Differential(t)

src/Blocks/utils.jl

@@ -55,27 +55,36 @@ Connector with one output signal of type Real.
 """ RealOutput
 
 """
-    SISO(;name, u_start=0.0, y_start=0.0)
+    SISO(;name, u_start = 0.0, y_start = 0.0)
 
 Single input single output (SISO) continuous system block.
 
 # Parameters:
 
-  - `u_start`: Initial value for the input
-  - `y_start`: Initial value for the output
+  - `u`: Initial value for the input
+  - `y`: Initial value for the output
 """
-@component function SISO(; name, u_start = 0.0, y_start = 0.0)
-    @named input = RealInput(u_start = u_start)
-    @named output = RealOutput(u_start = y_start)
-    @variables(u(t)=u_start, [description = "Input of SISO system $name"],
-        y(t)=y_start, [description = "Output of SISO system $name"],)
-    eqs = [u ~ input.u
-        y ~ output.u]
-    return ODESystem(eqs, t, [u, y], []; name = name, systems = [input, output])
+@mtkmodel SISO begin
+    @parameters begin
+        u_start = 0.0
+        y_start = 0.0
+    end
+    @variables begin
+        u(t) = u_start, [description = "Input of SISO system"]
+        y(t) = y_start, [description = "Output of SISO system"]
+    end
+    @components begin
+        input = RealInput(u_start = 0.0)
+        output = RealOutput(u_start = 0.0)
+    end
+    @equations begin
+        u ~ input.u
+        y ~ output.u
+    end
 end
 
 """
-    MIMO(;name, nin=1, nout=1, u_start=zeros(nin), y_start=zeros(nout))
+    MIMO(; name, nin = 1, nout = 1, u_start = zeros(nin), y_start = zeros(nout))
 
 Base class for a multiple input multiple output (MIMO) continuous system block.
 

src/Electrical/Analog/ideal_components.jl

@@ -89,17 +89,14 @@ Creates an ideal capacitor.
   - `C`: [`F`] Capacitance
   - `v_start`: [`V`] Initial voltage of capacitor
 """
-@mtkmodel Capacitor begin
-    @parameters begin
-        C
-    end
-    @variables begin
-        v
-    end
-    @extend v, i = oneport = OnePort(; v = v)
-    @equations begin
-        D(v) ~ i / C
-    end
+@component function Capacitor(; name, C, v_start = 0.0)
+    @named oneport = OnePort(; v_start = v_start)
+    @unpack v, i = oneport
+    pars = @parameters C = C
+    eqs = [
+        D(v) ~ i / C,
+    ]
+    extend(ODESystem(eqs, t, [], pars; name = name), oneport)
 end
 
 """
@@ -121,17 +118,14 @@ See [OnePort](@ref)
   - `L`: [`H`] Inductance
   - `i_start`: [`A`] Initial current through inductor
 """
-@mtkmodel Inductor begin # name, L, i_start = 0.0)
-    @parameters begin
-        L
-    end
-    @variables begin
-        i
-    end
-    @extend v, i = oneport = OnePort(; i = i)
-    @equations begin
-        D(i) ~ 1 / L * v
-    end
+@component function Inductor(; name, L, i_start = 0.0)
+    @named oneport = OnePort(; i_start = i_start)
+    @unpack v, i = oneport
+    pars = @parameters L = L
+    eqs = [
+        D(i) ~ 1 / L * v,
+    ]
+    extend(ODESystem(eqs, t, [], pars; name = name), oneport)
 end
 
 """

test/Hydraulic/isothermal_compressible.jl

@@ -256,7 +256,7 @@ end
         if use_input
             @named input = B.SampledData(Float64)
         else
-            @named input = B.TimeVaryingFunction(f; t)
+            @named input = B.TimeVaryingFunction(f)
         end
 
         push!(systems, input)