diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/CascadeLevelControl.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/CascadeLevelControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/CascadeLevelControl.mo" 2022-03-10 09:57:36.964143994 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/CascadeLevelControl.mo" 2022-03-10 09:58:31.924150959 +0000 @@ -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 "|Process| Pipe length"; parameter Length PipeD = 0.0254 "|Process| Pipe diameter"; parameter Length Lstart = 1 "|Process| Initial water level"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/LevelControl.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/LevelControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/LevelControl.mo" 2022-03-10 09:57:36.964143994 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Applications/ProcessControl/LevelControl.mo" 2022-03-10 09:58:31.840150947 +0000 @@ -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 "|Process| Pipe length"; parameter Length PipeD = 0.0254 "|Process| Pipe diameter"; parameter Length Lstart = 1 "|Process| Initial water level"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/Logic/Examples/TestRelay.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/Logic/Examples/TestRelay.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/Logic/Examples/TestRelay.mo" 2022-03-10 09:57:36.964143994 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/Logic/Examples/TestRelay.mo" 2022-03-10 09:58:31.128150858 +0000 @@ -2,7 +2,7 @@ model TestRelay "Test of relay controllers" extends Modelica.Icons.Example; - Modelica.Blocks.Sources.Sine Input(freqHz=1, amplitude=1) + 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( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/package.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/package.mo" 2022-03-10 09:57:36.964143994 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Controllers/package.mo" 2022-03-10 09:58:31.776150939 +0000 @@ -1,4 +1,4 @@ -within IndustrialControlSystems; +within IndustrialControlSystems; package Controllers "Industrial controllers" extends Modelica.Icons.Package; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/Examples/testDelay.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/Examples/testDelay.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/Examples/testDelay.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/Examples/testDelay.mo" 2022-03-10 09:58:30.668150799 +0000 @@ -7,7 +7,7 @@ amplitude=2, offset=2, startTime=2, - freqHz=0.2) +f =0.2) annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); IndustrialControlSystems.LinearSystems.Continuous.Delay delay annotation (Placement(transformation(extent={{-40,40},{-16,62}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/package.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/package.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/LinearSystems/package.mo" 2022-03-10 09:58:31.020150844 +0000 @@ -1,4 +1,4 @@ -within IndustrialControlSystems; +within IndustrialControlSystems; package LinearSystems "Linear systems blocks" extends Modelica.Icons.Package; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Comparisons/Examples/TestComparison.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Comparisons/Examples/TestComparison.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Comparisons/Examples/TestComparison.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Comparisons/Examples/TestComparison.mo" 2022-03-10 09:58:30.628150793 +0000 @@ -5,11 +5,11 @@ parameter Real eps = 0.01 "|Real numbers| Comparison threshold"; 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 -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Examples/countZeroCrossing.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Examples/countZeroCrossing.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Examples/countZeroCrossing.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Examples/countZeroCrossing.mo" 2022-03-10 09:58:30.420150768 +0000 @@ -11,7 +11,7 @@ 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 -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Functions/count.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Functions/count.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Functions/count.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/Logical/Counter/Functions/count.mo" 2022-03-10 09:58:30.404150765 +0000 @@ -32,17 +32,13 @@ NVal := val; Q := true; end if; - - if (NVal==-1) then - NVal :=Max; - elseif (NVal==Max+1) then + if NVal == (-1) then + NVal := Max; + elseif NVal == Max + 1 then NVal := 0; - else end if; - - if (Q==true and NVal==0) then + if Q == true and NVal == 0 then Q := false; - else end if; annotation (Documentation(revisions="
First release of the Industrial Control Systems: April-May 2012
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/MathOperations/RealType/Signals/noiseGen.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/MathOperations/RealType/Signals/noiseGen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/MathOperations/RealType/Signals/noiseGen.mo" 2022-03-10 09:57:36.968143996 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/MathOperations/RealType/Signals/noiseGen.mo" 2022-03-10 09:58:29.544150656 +0000 @@ -1,7 +1,7 @@ within IndustrialControlSystems.MathOperations.RealType.Signals; model noiseGen "Noise generator" extends Interfaces.RealNinOperation(final useInputs=false, final FixedPoint=false, final Nbit = 1, final scaleFactor = 1, final MAX = 1, final MIN = 0); - parameter Modelica.SIunits.Time Ts = 0.1 "|Noise generator| Sampling time" annotation(Evaluate = true); + parameter Modelica.Units.SI.Time Ts = 0.1 "|Noise generator| Sampling time" annotation(Evaluate = true); parameter Real amp = 0.01 "|Noise generator| Amplitude" annotation(Evaluate = true); parameter Real Tf = 1 "|Noise generator| First order filter time constant" annotation(Evaluate = true); parameter Real X_start = 1 "|Noise generator| Initial value" annotation(Evaluate=true); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/openmodelica.metadata.json" 2022-03-10 09:57:36.980143997 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/openmodelica.metadata.json" 2022-03-10 09:58:32.144150985 +0000 @@ -1 +1 @@ -{"path":"IndustrialControlSystems", "provides":["0.0.0"], "sha":"d2d882d78be9af6c9b95a349879d4380dd820593", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"1.1.0-master", "zipfile":"https://github.com/looms-polimi/IndustrialControlSystems/archive/d2d882d78be9af6c9b95a349879d4380dd820593.zip"} +{"path": "IndustrialControlSystems", "provides": ["0.0.0"], "sha": "d2d882d78be9af6c9b95a349879d4380dd820593", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "1.1.0-master", "zipfile": "https://github.com/looms-polimi/IndustrialControlSystems/archive/d2d882d78be9af6c9b95a349879d4380dd820593.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"} \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/package.mo" "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/package.mo" 2022-03-10 09:57:36.980143997 +0000 +++ "converted-libraries/.openmodelica/libraries/IndustrialControlSystems 1.1.0-master/package.mo" 2022-03-10 09:58:32.144150985 +0000 @@ -8,7 +8,7 @@

"), - uses(Modelica(version="3.2.3")), + uses(Modelica(version= "4.0.0")), version="1.1.0", conversion(noneFromVersion="")); end IndustrialControlSystems;