diff --git a/IndustrialControlSystems/Applications/ProcessControl/CascadeLevelControl.mo b/IndustrialControlSystems/Applications/ProcessControl/CascadeLevelControl.mo index 2b563be..de76c88 100644 --- a/IndustrialControlSystems/Applications/ProcessControl/CascadeLevelControl.mo +++ b/IndustrialControlSystems/Applications/ProcessControl/CascadeLevelControl.mo @@ -1,7 +1,7 @@ within IndustrialControlSystems.Applications.ProcessControl; model CascadeLevelControl "Cascade level control with PI controllers" extends Modelica.Icons.Example; - import Modelica.SIunits.*; + import Modelica.Units.SI.*; parameter Length PipeL = 1 "Pipe length" annotation(Dialog(group = "Process")); parameter Length PipeD = 0.0254 "Pipe diameter" @@ -158,8 +158,8 @@ model CascadeLevelControl "Cascade level control with PI controllers" Kp=Kp_v, Ti=Ti_v) annotation (Placement(transformation(extent={{-44,-36},{-24,-16}}))); - Modelica.Fluid.Sensors.MassFlowRate flowRateSensor(redeclare package Medium - = Modelica.Media.Water.ConstantPropertyLiquidWater) + Modelica.Fluid.Sensors.MassFlowRate flowRateSensor(redeclare package Medium = + Modelica.Media.Water.ConstantPropertyLiquidWater) annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=0, origin={98,-58}))); diff --git a/IndustrialControlSystems/Applications/ProcessControl/LevelControl.mo b/IndustrialControlSystems/Applications/ProcessControl/LevelControl.mo index 4f45a3e..fb79b19 100644 --- a/IndustrialControlSystems/Applications/ProcessControl/LevelControl.mo +++ b/IndustrialControlSystems/Applications/ProcessControl/LevelControl.mo @@ -1,7 +1,7 @@ within IndustrialControlSystems.Applications.ProcessControl; model LevelControl "Level control with a PI controller" extends Modelica.Icons.Example; - import Modelica.SIunits.*; + import Modelica.Units.SI.*; parameter Length PipeL = 1 "Pipe length" annotation(Dialog(group = "Process")); parameter Length PipeD = 0.0254 "Pipe diameter" diff --git a/IndustrialControlSystems/Controllers/Blocks/Examples/TestTrackingP.mo b/IndustrialControlSystems/Controllers/Blocks/Examples/TestTrackingP.mo index 4824994..e6a5c67 100644 --- a/IndustrialControlSystems/Controllers/Blocks/Examples/TestTrackingP.mo +++ b/IndustrialControlSystems/Controllers/Blocks/Examples/TestTrackingP.mo @@ -5,9 +5,8 @@ model TestTrackingP "Tracking test mode for P block" IndustrialControlSystems.Controllers.Blocks.P P "proportional controller" annotation (Placement(transformation(extent={{-60,60},{-40, 80}}, rotation=0))); - Modelica.Blocks.Sources.Sine Input(amplitude=2, freqHz=1) - annotation (Placement(transformation(extent={{-100,60},{-80,80}}, - rotation=0))); + Modelica.Blocks.Sources.Sine Input(amplitude=2, f=1) annotation (Placement( + transformation(extent={{-100,60},{-80,80}}, rotation=0))); IndustrialControlSystems.Controllers.Blocks.P Ptr(useTS=true) "proportional controller with tracking mode" annotation (Placement(transformation(extent={{-60,-80},{ diff --git a/IndustrialControlSystems/Controllers/Interfaces/Controller.mo b/IndustrialControlSystems/Controllers/Interfaces/Controller.mo index 5f25bc9..4ece88f 100644 --- a/IndustrialControlSystems/Controllers/Interfaces/Controller.mo +++ b/IndustrialControlSystems/Controllers/Interfaces/Controller.mo @@ -14,9 +14,9 @@ partial model Controller "Partial interface for a generic controller" "Discretisation method" annotation(Evaluate = true, Dialog(group = "Discretisation")); parameter Boolean AntiWindup = false - "Flag that enables the antiwindup feature" + "Flag that enables the antiwindup feature" annotation(Evaluate = true, Dialog(group = "Saturation")); - parameter Real CSmin = 0 "minimum value of the CS" + parameter Real CSmin = 0 "minimum value of the CS" annotation(Evaluate = true, Dialog(group = "Saturation")); parameter Real CSmax = 1 "maximum value of the CS" annotation(Evaluate = true, Dialog(group = "Saturation")); diff --git a/IndustrialControlSystems/Controllers/Logic/Examples/TestRelay.mo b/IndustrialControlSystems/Controllers/Logic/Examples/TestRelay.mo index 0294e19..27091fd 100644 --- a/IndustrialControlSystems/Controllers/Logic/Examples/TestRelay.mo +++ b/IndustrialControlSystems/Controllers/Logic/Examples/TestRelay.mo @@ -2,9 +2,8 @@ within IndustrialControlSystems.Controllers.Logic.Examples; model TestRelay "Test of relay controllers" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine Input(freqHz=1, amplitude=1) - annotation (Placement(transformation(extent={{-100,60},{-80,80}}, - rotation=0))); + Modelica.Blocks.Sources.Sine Input(f=1, amplitude=1) annotation (Placement( + transformation(extent={{-100,60},{-80,80}}, rotation=0))); IndustrialControlSystems.Controllers.Logic.RelayHysteresis Rhyst_DIGITAL( initState=false, ThL=-0.5, diff --git a/IndustrialControlSystems/Controllers/package.mo b/IndustrialControlSystems/Controllers/package.mo index 98a1e29..5876f79 100644 --- a/IndustrialControlSystems/Controllers/package.mo +++ b/IndustrialControlSystems/Controllers/package.mo @@ -1,4 +1,4 @@ -within IndustrialControlSystems; +within IndustrialControlSystems; package Controllers "Industrial controllers" extends Modelica.Icons.Package; diff --git a/IndustrialControlSystems/LinearSystems/Examples/testDelay.mo b/IndustrialControlSystems/LinearSystems/Examples/testDelay.mo index 1ad3a37..940d764 100644 --- a/IndustrialControlSystems/LinearSystems/Examples/testDelay.mo +++ b/IndustrialControlSystems/LinearSystems/Examples/testDelay.mo @@ -7,8 +7,7 @@ model testDelay amplitude=2, offset=2, startTime=2, - freqHz=0.2) - annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); + f=0.2) annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); IndustrialControlSystems.LinearSystems.Continuous.Delay delay annotation (Placement(transformation(extent={{-40,40},{-16,62}}))); IndustrialControlSystems.LinearSystems.Discrete.MultiStepsDelay multiStepsDelay(Ts=0.1, N= diff --git a/IndustrialControlSystems/LinearSystems/package.mo b/IndustrialControlSystems/LinearSystems/package.mo index df91c55..2161a28 100644 --- a/IndustrialControlSystems/LinearSystems/package.mo +++ b/IndustrialControlSystems/LinearSystems/package.mo @@ -1,4 +1,4 @@ -within IndustrialControlSystems; +within IndustrialControlSystems; package LinearSystems "Linear systems blocks" extends Modelica.Icons.Package; diff --git a/IndustrialControlSystems/Logical/Comparisons/Examples/TestComparison.mo b/IndustrialControlSystems/Logical/Comparisons/Examples/TestComparison.mo index f0c1ee8..166f5e4 100644 --- a/IndustrialControlSystems/Logical/Comparisons/Examples/TestComparison.mo +++ b/IndustrialControlSystems/Logical/Comparisons/Examples/TestComparison.mo @@ -7,11 +7,11 @@ model TestComparison annotation(Dialog(group = "Real numbers")); RealType.Equal equal(Ts=Ts, eps=eps) annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Modelica.Blocks.Sources.Sine sine(amplitude=1, freqHz=1) + Modelica.Blocks.Sources.Sine sine(amplitude=1, f=1) annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); Modelica.Blocks.Sources.Sine cosine( amplitude=1, - freqHz=1, + f=1, phase=1.5707963267949) annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); RealType.Less less(Ts=Ts, eps=eps) diff --git a/IndustrialControlSystems/Logical/Counter/Examples/countZeroCrossing.mo b/IndustrialControlSystems/Logical/Counter/Examples/countZeroCrossing.mo index d3d222d..9db7399 100644 --- a/IndustrialControlSystems/Logical/Counter/Examples/countZeroCrossing.mo +++ b/IndustrialControlSystems/Logical/Counter/Examples/countZeroCrossing.mo @@ -11,7 +11,7 @@ model countZeroCrossing "test model of the counter" Modelica.Blocks.Sources.BooleanTable reset(startValue=false, table={15}) annotation (Placement( transformation(extent={{-100,-50},{-80,-30}}))); - Modelica.Blocks.Sources.Sine sine(amplitude=1, freqHz=1) + Modelica.Blocks.Sources.Sine sine(amplitude=1, f=1) annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); Comparisons.RealType.Equal equal(Ts=0.01, eps=0.005) diff --git a/IndustrialControlSystems/MathOperations/RealType/Expression.mo b/IndustrialControlSystems/MathOperations/RealType/Expression.mo index 0ae6ce9..ed73abd 100644 --- a/IndustrialControlSystems/MathOperations/RealType/Expression.mo +++ b/IndustrialControlSystems/MathOperations/RealType/Expression.mo @@ -25,10 +25,9 @@ model Expression "User defined real function" "String that represent the name of the implemented function"; replaceable function g = IndustrialControlSystems.MathOperations.RealType.Functions.GeneralReScalingFunction - "Output re-scaling function" - annotation ( - Dialog(group = "Fixed Point"), - Documentation( + "Output re-scaling function" annotation ( + Dialog(group = "Fixed Point"), + Documentation( revisions="
Industrial Control Systems (v 1.0.0) : April-May 2012
List of revisions:
diff --git a/IndustrialControlSystems/MathOperations/RealType/Interfaces/RealNinOperation.mo b/IndustrialControlSystems/MathOperations/RealType/Interfaces/RealNinOperation.mo index b52e259..c0a3d18 100644 --- a/IndustrialControlSystems/MathOperations/RealType/Interfaces/RealNinOperation.mo +++ b/IndustrialControlSystems/MathOperations/RealType/Interfaces/RealNinOperation.mo @@ -1,6 +1,7 @@ within IndustrialControlSystems.MathOperations.RealType.Interfaces; partial model RealNinOperation "Real comparison interface" - parameter Modelica.SIunits.Time Ts = 0.1 "sampling time" annotation(Evaluate=true); + parameter Modelica.Units.SI.Time Ts=0.1 "sampling time" + annotation (Evaluate=true); parameter Integer nInput = 1 "number of inputs" annotation(Evaluate=true); parameter Boolean useInputs = true "=true, if inputs are enabled" annotation(Evaluate=true, HideResult=true, choices(checkBox=true)); diff --git a/IndustrialControlSystems/Resources/Conversion/ConvertFromIndustrialControlSystems_1.2.0.mos b/IndustrialControlSystems/Resources/Conversion/ConvertFromIndustrialControlSystems_1.2.0.mos new file mode 100644 index 0000000..245273b --- /dev/null +++ b/IndustrialControlSystems/Resources/Conversion/ConvertFromIndustrialControlSystems_1.2.0.mos @@ -0,0 +1,8 @@ +// Generated by conversion of IndustrialControlSystems +convertElement("IndustrialControlSystems.Logical.Comparisons.Examples.TestComparison","cosine.freqHz","cosine.f"); +convertElement("IndustrialControlSystems.Logical.Comparisons.Examples.TestComparison","sine.freqHz","sine.f"); +convertElement("IndustrialControlSystems.Logical.Counter.Examples.countZeroCrossing","sine.freqHz","sine.f"); +convertElement("IndustrialControlSystems.LinearSystems.Examples.testDelay","signal.freqHz","signal.f"); +convertElement("IndustrialControlSystems.Controllers.Blocks.Examples.TestTrackingP","Input.freqHz","Input.f"); +convertElement("IndustrialControlSystems.Controllers.Logic.Examples.TestRelay","Input.freqHz","Input.f"); +convertElement("IndustrialControlSystems.Applications.ProcessControl.VelocityDriveControl_AutoTuning","M1.quasiStationary","M1.quasiStatic"); diff --git a/IndustrialControlSystems/package.mo b/IndustrialControlSystems/package.mo index 443ebbd..06983ac 100644 --- a/IndustrialControlSystems/package.mo +++ b/IndustrialControlSystems/package.mo @@ -8,7 +8,9 @@ package IndustrialControlSystems "Modelica Industrial Control Systems Library"

"), - uses(Modelica(version="3.2.3")), - version="1.2.0", - conversion(noneFromVersion="1.1.0")); + uses(Modelica(version="4.0.0")), + version="2.0.0", + conversion(from( + version={"1.2.0","1.1.0"}, + script="modelica://IndustrialControlSystems/Resources/Conversion/ConvertFromIndustrialControlSystems_1.2.0.mos"))); end IndustrialControlSystems;