Merge pull request #26 from ValentinKaisermayer/fix-MTK-v8

Fixes for MTK v8

Author: ChrisRackauckas

Project.toml

@@ -12,7 +12,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 
 [compat]
 IfElse = "0.1"
-ModelingToolkit = "5.26, 6, 7"
+ModelingToolkit = "8"
 OffsetArrays = "1"
 OrdinaryDiffEq = "5.56, 6"
 Symbolics = "0.1, 1, 2, 3, 4"

README.md

@@ -219,7 +219,7 @@ type the name twice. The same principle applies to the other thermal components.
 - `C`: heat capacity (zero or positive)
 
 **State**:
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - heat port
@@ -233,7 +233,7 @@ type the name twice. The same principle applies to the other thermal components.
 
 **States**:
 - `Q_flow`: heat flow rate
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - two heat ports
@@ -249,7 +249,7 @@ type the name twice. The same principle applies to the other thermal components.
 
 **States**:
 - `Q_flow`: heat flow rate
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - two heat ports
@@ -265,7 +265,7 @@ type the name twice. The same principle applies to the other thermal components.
 
 **States**:
 - `Q_flow`: heat flow rate
-- `dT`: temperature difference (in Kelvin)
+- `dT`: temperature difference (in kelvin)
 
 **Connectors**:
 - two heat ports (for modeling of the fluid flow over the solid)
@@ -281,7 +281,7 @@ type the name twice. The same principle applies to the other thermal components.
 
 **States**:
 - `Q_flow`: heat flow rate
-- `dT`: temperature difference (in Kelvin)
+- `dT`: temperature difference (in kelvin)
 
 **Connectors**:
 - two heat ports (for modeling of the fluid flow over the solid)
@@ -314,7 +314,7 @@ to a singular heatport.
 
 **States**:
 - `Q_flow`: heat flow rate
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - `hp1...hpN`: the respective heatports
@@ -328,10 +328,10 @@ to a singular heatport.
 
 **Function**: `TemperatureSensor(;name)`
 
-**Description**: Ideal absolute temperature sensor which outputs the temperature (in Kelvin) of the connected port.
+**Description**: Ideal absolute temperature sensor which outputs the temperature (in kelvin) of the connected port.
 
 **States**:
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - heat port
@@ -340,10 +340,10 @@ to a singular heatport.
 
 **Function**: `RelativeTemperatureSensor(;name)`
 
-**Description**: The output of the sensor is the relative temperature, i.e., the difference of the two ports, given in Kelvin.
+**Description**: The output of the sensor is the relative temperature, i.e., the difference of the two ports, given in kelvin.
 
 **States**:
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - two heat ports
@@ -380,10 +380,10 @@ to a singular heatport.
 
 **Function**: `FixedTemperature(;name, T = 0.0)`
 
-**Description**: The model defines a fixed temperature (in Kelvin) at a given port.
+**Description**: The model defines a fixed temperature (in kelvin) at a given port.
 
 **Observables**:
-- `T`: temperature (in Kelvin)
+- `T`: temperature (in kelvin)
 
 **Connectors**:
 - heat port

src/Blocks/Blocks.jl

@@ -1,29 +1,29 @@
 """
 The module `Blocks` contains common input-output components, referred to as blocks.
-
-In general, input-output blocks follow the convention 
-```
-     ┌───────────┐
- u   │  ẋ=f(x,u) │  y
-────►│  y=g(x,u) ├────►
-     │           │
-     └───────────┘
-```
-where `u` are inputs, `x` are state variables and `y` are outputs. `x,u,y` are all implemented as `@variables` internally, `u` are marked as `[input=true]` and `y` are marked `[output=true]`.
 """
 module Blocks
 using ModelingToolkit, Symbolics, IfElse, OrdinaryDiffEq
+using IfElse: ifelse
 
 @parameters t
-Dₜ = Differential(t)
+D = Differential(t)
+
+export RealInput, RealOutput, SISO
+include("utils.jl")
 
-export Gain, Sum
+export Gain, Sum, MatrixGain, Sum, Feedback, Add, Product, Division
+export Abs, Sign, Sqrt, Sin, Cos, Tan, Asin, Acos, Atan, Atan2, Sinh, Cosh, Tanh, Exp
+export Log, Log10
 include("math.jl")
 
-export Saturation, DeadZone
+export Constant, Sine, Cosine, ContinuousClock, Ramp, Step, ExpSine
+include("sources.jl")
+
+export Limiter, DeadZone, SlewRateLimiter
 include("nonlinear.jl")
 
-export Constant, Integrator, Derivative, FirstOrder, SecondOrder, PID, StateSpace
+export Integrator, Derivative, FirstOrder, SecondOrder, StateSpace
+export PI, LimPI, PID, LimPID
 include("continuous.jl")
 
 end