diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Control/Modulation.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Control/Modulation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Control/Modulation.mo" 2021-11-24 08:09:23.711358296 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Control/Modulation.mo" 2021-11-24 08:10:09.419220884 +0000 @@ -1238,7 +1238,7 @@ origin={-240,-70}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.StateGraph.StepWithSignal sector2 + Modelica.StateGraph.StepWithSignal sector2(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,170},{138,190}}))); Modelica.StateGraph.TransitionWithSignal t1 annotation (Placement(transformation(extent={{-124,190},{-104,210}}))); @@ -1260,10 +1260,10 @@ annotation (Placement(transformation(extent={{-124,30},{-104,50}}))); Modelica.StateGraph.Alternative Alternative2 annotation (Placement(transformation(extent={{-58,124},{218,276}}))); - Modelica.StateGraph.Step Step1 + Modelica.StateGraph.Step Step1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ -94,190},{-74,210}}))); - Modelica.StateGraph.Step Step2 + Modelica.StateGraph.Step Step2(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ -94,30},{-74,50}}))); Modelica.StateGraph.Alternative Alternative3 @@ -1276,10 +1276,10 @@ annotation (Placement(transformation(extent={{-4,228},{16,248}}))); Modelica.StateGraph.TransitionWithSignal t4 annotation (Placement(transformation(extent={{-2,152},{18,172}}))); - Modelica.StateGraph.Step Step3 + Modelica.StateGraph.Step Step3(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ 28,152},{48,172}}))); - Modelica.StateGraph.Step Step4 + Modelica.StateGraph.Step Step4(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ 26,68},{46,88}}))); Modelica.StateGraph.TransitionWithSignal t5 @@ -1300,15 +1300,15 @@ annotation (Placement(transformation(extent={{88,86},{108,106}}))); Modelica.StateGraph.TransitionWithSignal t10 annotation (Placement(transformation(extent={{88,50},{108,70}}))); - Modelica.StateGraph.StepWithSignal sector3 + Modelica.StateGraph.StepWithSignal sector3(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,134},{138,154}}))); - Modelica.StateGraph.StepWithSignal sector1 + Modelica.StateGraph.StepWithSignal sector1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,228},{138,248}}))); - Modelica.StateGraph.StepWithSignal sector6 + Modelica.StateGraph.StepWithSignal sector6(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,-8},{138,12}}))); - Modelica.StateGraph.StepWithSignal sector5 + Modelica.StateGraph.StepWithSignal sector5(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,50},{138,70}}))); - Modelica.StateGraph.StepWithSignal sector4 + Modelica.StateGraph.StepWithSignal sector4(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,86},{138,106}}))); Modelica.StateGraph.Transition t11(enableTimer=true, waitTime=T_pwm) annotation (Placement(transformation(extent={{148,228},{168,248}}))); @@ -1353,7 +1353,7 @@ annotation (Placement(transformation(extent={{-280,-160},{-260,-140}}))); Modelica.Blocks.Interfaces.BooleanOutput trigger annotation (Placement(transformation(extent={{300,100},{340,140}}))); - Modelica.StateGraph.InitialStep InitialStep1 + Modelica.StateGraph.InitialStep InitialStep1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{-280,110},{-260,130}}))); Modelica.Blocks.Logical.Or Or1 annotation (Placement(transformation(extent={{ @@ -2673,7 +2673,9 @@ Modifications needed for adaptation to Spot are mentioned in info-layer of the corresponding models.

")); + end SpaceVector; + annotation (preferredView="info", Documentation(info="

Asynchronous and synchronous PWM control of inverter-gates, three- and one-phase.

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Drives.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Drives.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Drives.mo" 2021-11-24 08:09:23.715358286 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Drives.mo" 2021-11-24 08:10:07.079227915 +0000 @@ -260,7 +260,7 @@ controllerType=Modelica.Blocks.Types.SimpleController.PI, Ti=0.1, yMax=1, - initType=Modelica.Blocks.Types.InitPID.SteadyState, + initType=Modelica.Blocks.Types.Init.SteadyState, gainPID(y(start=0.1))) annotation (Placement(transformation(extent={{-50,0},{-30,20}}))); @@ -427,7 +427,7 @@ Ti=0.2, Td=0.1, controllerType=Modelica.Blocks.Types.SimpleController.PI, - initType=Modelica.Blocks.Types.InitPID.SteadyState, + initType=Modelica.Blocks.Types.Init.SteadyState, yMax=1, gainPID(y(start=0.1))) annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); @@ -513,7 +513,7 @@ Td=0.05, controllerType=Modelica.Blocks.Types.SimpleController.PI, Ti=0.2, - initType=Modelica.Blocks.Types.InitPID.InitialState, + initType=Modelica.Blocks.Types.Init.InitialState, xi_start=0.1, yMax=1) annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); @@ -614,7 +614,7 @@ Ti=0.1, yMax=1, gainPID(y(start=0.1)), - initType=Modelica.Blocks.Types.InitPID.SteadyState) + initType=Modelica.Blocks.Types.Init.SteadyState) annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Generation.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Generation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Generation.mo" 2021-11-24 08:09:23.715358286 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Examples/AC3ph/Generation.mo" 2021-11-24 08:10:06.495229670 +0000 @@ -1117,6 +1117,7 @@ "), experiment(StopTime=60, Interval=60e-3)); end WindGeneratorLine; + model Islanding "AC synchronous generator in islanding configuration" extends Modelica.Icons.Example; @@ -1175,7 +1176,7 @@ Td=0.1, Ti=0.5, k=1/vDC_nom, - initType=Modelica.Blocks.Types.InitPID.SteadyState) + initType=Modelica.Blocks.Types.Init.SteadyState) annotation (Placement(transformation(extent={{40,20},{20,40}}))); Modelica.Blocks.Sources.Constant set_vDC(k=vDC_nom) annotation (Placement(transformation(extent={{70,20},{50,40}}))); @@ -1232,6 +1233,7 @@

up users guide

"), experiment(StopTime=30)); + end Islanding; model LocalGeneration @@ -1302,7 +1304,7 @@ Modelica.Blocks.Continuous.LimPID PI_vDC( Td=0.05, controllerType=Modelica.Blocks.Types.SimpleController.PI, - initType=Modelica.Blocks.Types.InitPID.SteadyState, + initType=Modelica.Blocks.Types.Init.SteadyState, Ti=0.1, k=0.3*I_nom/vDC_nom, yMax=1.4*I_nom) @@ -1353,8 +1355,8 @@

up users guide

"), experiment(StopTime=30)); -end LocalGeneration; +end LocalGeneration; annotation (preferredView="info", Documentation(info="

Power sources and generation, a set of examples mainly for understanding the synchronous machine.

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Types/SI.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Types/SI.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Types/SI.mo" 2021-11-24 08:09:23.719358274 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/Types/SI.mo" 2021-11-24 08:10:03.955237303 +0000 @@ -1,7 +1,7 @@ within PowerSystems.Types; package SI "SI types with custom attributes, like display units" extends Modelica.Icons.Package; - import MSI = Modelica.SIunits; + import MSI = Modelica.Units.SI; type Time = MSI.Time; type Frequency = MSI.Frequency; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/openmodelica.metadata.json" 2021-11-24 08:09:23.719358274 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/openmodelica.metadata.json" 2021-11-24 08:10:12.159212650 +0000 @@ -1 +1 @@ -{"path":"PowerSystems", "sha":"07b5d32cc291e2397becd2f97351c0bc1a375d54", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"1.0.1-master", "zipfile":"https://github.com/modelica-3rdparty/PowerSystems/archive/07b5d32cc291e2397becd2f97351c0bc1a375d54.zip"} +{"path": "PowerSystems", "sha": "07b5d32cc291e2397becd2f97351c0bc1a375d54", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "1.0.1-master", "zipfile": "https://github.com/modelica-3rdparty/PowerSystems/archive/07b5d32cc291e2397becd2f97351c0bc1a375d54.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/PowerSystems 1.0.1-master/package.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/package.mo" 2021-11-24 08:09:23.719358274 +0000 +++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.1-master/package.mo" 2021-11-24 08:10:04.131236774 +0000 @@ -3,8 +3,8 @@ extends Modelica.Icons.Package; import Modelica.Constants.pi; - import PowerSystems.Types.SI "SI types with custom display units"; - import PowerSystems.Types.SIpu "per-unit types for user interface"; + import PowerSystems.Types.SI ; + import PowerSystems.Types.SIpu ; constant String TableDir=Modelica.Utilities.Files.loadResource("modelica://PowerSystems/Resources/Tables/") "Directory of example tables"; @@ -13,6 +13,32 @@ PhaseSystems.ThreePhase_dq "Default phase system" annotation (choicesAllMatching=true); + + + + + + + + + + + + + + + + + + + + + + + + + + annotation (preferredView="info", version="1.0.1", versionDate="2021-06-30", @@ -32,7 +58,7 @@

"), - uses(Modelica(version="3.2.3")), + uses(Modelica(version= "4.0.0")), Icon(graphics={ Line( points={{-60,-16},{38,-16}},