Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modelica Standard Library 4.0.0 #50

Closed
justnielsen opened this issue Nov 1, 2022 · 2 comments · Fixed by #51
Closed

Modelica Standard Library 4.0.0 #50

justnielsen opened this issue Nov 1, 2022 · 2 comments · Fixed by #51

Comments

@justnielsen
Copy link

The PowerSystems library still uses Modelica Standard Library (MSL) version 3.2.3. It would be great to have it updated to MSL v. 4.0.0.

@sjoelund
Copy link
Contributor

sjoelund commented Nov 1, 2022

I could run the OpenModelica conversion script on the master if the maintainers would like. For 1.0.0 it's a quite small patch:

diff -ur --exclude openmodelica.metadata.json "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Control/Modulation.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Control/Modulation.mo"
--- "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Control/Modulation.mo"	2022-08-31 16:07:38.946997874 +0200
+++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Control/Modulation.mo"	2022-09-16 14:28:14.364111135 +0200
@@ -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={{
diff -ur --exclude openmodelica.metadata.json "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Drives.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Drives.mo"
--- "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Drives.mo"	2022-08-31 16:07:38.946997874 +0200
+++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Drives.mo"	2022-09-16 14:28:12.714111150 +0200
@@ -256,7 +256,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}})));
 
@@ -421,7 +421,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}})));
@@ -506,7 +506,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}})));
@@ -606,7 +606,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 --exclude openmodelica.metadata.json "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Generation.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Generation.mo"
--- "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Generation.mo"	2022-08-31 16:07:38.946997874 +0200
+++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Examples/AC3ph/Generation.mo"	2022-09-16 14:28:12.344111154 +0200
@@ -1163,7 +1163,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}})));
@@ -1290,7 +1290,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)
diff -ur --exclude openmodelica.metadata.json "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Types/SI.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Types/SI.mo"
--- "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/Types/SI.mo"	2022-08-31 16:07:38.946997874 +0200
+++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/Types/SI.mo"	2022-09-16 14:28:09.984111176 +0200
@@ -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 --exclude openmodelica.metadata.json "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/package.mo" "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/package.mo"
--- "/home/marsj/.openmodelica/libraries/PowerSystems 1.0.0/package.mo"	2022-08-31 16:07:38.956997873 +0200
+++ "converted-libraries/.openmodelica/libraries/PowerSystems 1.0.0/package.mo"	2022-09-16 14:28:10.244111174 +0200
@@ -32,7 +32,7 @@
 <p/>
 </html>
 "),
-  uses(Modelica(version="3.2.2")),
+  uses(Modelica(version="4.0.0")),
   Icon(graphics={
       Line(
         points={{-60,-16},{38,-16}},

@justnielsen
Copy link
Author

@sjoelund that would be great!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants