Merge pull request #1 from sjoelund/master

Fixes from OpenModelica testing
modelica-3rdparty · Oct 7, 2014 · 425fc8b · 425fc8b
2 parents d420439 + cedb254
commit 425fc8b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/PowerSystems/Examples/Spot/DrivesAC3ph.mo b/PowerSystems/Examples/Spot/DrivesAC3ph.mo
@@ -505,7 +505,7 @@ The machine defines the reference-system independent of the system choice (as ne
       Ti=0.2,
       Td=0.1,
       controllerType=Modelica.Blocks.Types.SimpleController.PI,
-      initType=Modelica.Blocks.Types.Init.SteadyState)
+      initType=Modelica.Blocks.Types.InitPID.SteadyState)
            annotation (Placement(transformation(extent={{-60,10},{-40,30}},
             rotation=0)));
     PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm400V_30kVA syn3rdpm400_30k

diff --git a/PowerSystems/Examples/Spot/DrivesDC.mo b/PowerSystems/Examples/Spot/DrivesDC.mo
@@ -37,7 +37,7 @@ package DrivesDC "DC drives"
       fileName=TableDir + "hNormProfile.tab",
       colData=3)
     annotation (Placement(transformation(extent={{60,-20},{80,0}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Machines.DCser1500V_1p5MVA DCs1500_1p5M
+    parameter PowerSystems.Examples.Spot.Data.Machines.DCser1500V_1p5MVA DCs1500_1p5M
       annotation (Placement(transformation(extent={{-60,80},{-20,100}},
             rotation=0)));
 
@@ -115,7 +115,7 @@ package DrivesDC "DC drives"
       slope_perc=2.5,
       cFrict={50,15})
     annotation (Placement(transformation(extent={{60,-20},{80,0}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Machines.DCpar1500V_1p5MVA DCp1500_1p5M
+    parameter PowerSystems.Examples.Spot.Data.Machines.DCpar1500V_1p5MVA DCp1500_1p5M
       annotation (Placement(transformation(extent={{-60,80},{-20,100}},
             rotation=0)));
 
@@ -189,7 +189,7 @@ package DrivesDC "DC drives"
       useSupport=false)
                 annotation (Placement(transformation(extent={{90,20},{70,40}},
             rotation=0)));
-    PowerSystems.Examples.Spot.Data.Machines.DCpm100V_1kVA DCpm100_1k
+    parameter PowerSystems.Examples.Spot.Data.Machines.DCpm100V_1kVA DCpm100_1k
                                            annotation (Placement(transformation(
             extent={{-60,80},{-20,100}}, rotation=0)));
 
@@ -279,7 +279,7 @@ package DrivesDC "DC drives"
       useSupport=false)
                 annotation (Placement(transformation(extent={{90,20},{70,40}},
             rotation=0)));
-    PowerSystems.Examples.Spot.Data.Machines.BLDC100V_1kVA bldc100_1k
+    parameter PowerSystems.Examples.Spot.Data.Machines.BLDC100V_1kVA bldc100_1k
                                            annotation (Placement(transformation(
             extent={{-60,80},{-20,100}}, rotation=0)));
     PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A

diff --git a/PowerSystems/Examples/Spot/GenerationAC3ph.mo b/PowerSystems/Examples/Spot/GenerationAC3ph.mo
@@ -1338,7 +1338,7 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
     Td=0.1,
     Ti=0.5,
     k=1/vDC_nom,
-    initType=Modelica.Blocks.Types.Init.SteadyState)
+    initType=Modelica.Blocks.Types.InitPID.SteadyState)
          annotation (Placement(transformation(extent={{40,20},{20,40}},
             rotation=0)));
   Modelica.Blocks.Sources.Constant set_vDC(k=vDC_nom)
@@ -1486,7 +1486,7 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
   Modelica.Blocks.Continuous.LimPID PI_vDC(
       Td=0.05,
       controllerType=Modelica.Blocks.Types.SimpleController.PI,
-      initType=Modelica.Blocks.Types.Init.SteadyState,
+      initType=Modelica.Blocks.Types.InitPID.SteadyState,
     Ti=0.1,
       k=0.3*I_nom/vDC_nom,
       yMax=1.4*I_nom)
@@ -1495,11 +1495,11 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
   Modelica.Blocks.Math.Gain gain(k=-1) "generator: negative torque tau_act"
                                        annotation (Placement(transformation(
             extent={{-40,20},{-20,40}}, rotation=0)));
-  PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm560V_100kVA syn3rdpm560_100k(
+  parameter PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm560V_100kVA syn3rdpm560_100k(
                                                            neu_iso=true)
       annotation (Placement(transformation(extent={{-60,80},{-20,100}},
             rotation=0)));
-  PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC1kV_100A idealSC1k_100(
+  parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC1kV_100A idealSC1k_100(
                                                     Vf=0)
     annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
 

diff --git a/PowerSystems/Examples/Spot/InvertersAC1ph_DC.mo b/PowerSystems/Examples/Spot/InvertersAC1ph_DC.mo
@@ -41,7 +41,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
             extent={{90,0},{110,20}}, rotation=0)));
     PowerSystems.Common.Thermal.BdCondV bdCond(m=2) annotation (Placement(
           transformation(extent={{10,20},{30,40}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
+    parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
       annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
 
   equation
@@ -316,7 +316,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
             extent={{80,-20},{100,0}}, rotation=0)));
     PowerSystems.Common.Thermal.BdCondV bdCond(m=1) annotation (Placement(
           transformation(extent={{-30,0},{-10,20}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
+    parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
       annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
 
   equation
@@ -400,7 +400,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
             extent={{-80,-20},{-100,0}}, rotation=0)));
     PowerSystems.Common.Thermal.BdCondV bdCond(m=2) annotation (Placement(
           transformation(extent={{-10,0},{10,20}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
+    parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
       annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
 
   equation

diff --git a/PowerSystems/Examples/Spot/InvertersAC3ph.mo b/PowerSystems/Examples/Spot/InvertersAC3ph.mo
@@ -45,7 +45,7 @@ package InvertersAC3ph "Inverters dqo"
               0},{110,20}}, rotation=0)));
     PowerSystems.Common.Thermal.BdCondV bdCond(m=3) annotation (Placement(
           transformation(extent={{10,20},{30,40}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
+    parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
       annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
 
   equation

diff --git a/PowerSystems/Examples/Spot/TransmissionAC3ph.mo b/PowerSystems/Examples/Spot/TransmissionAC3ph.mo
@@ -594,7 +594,7 @@ Compare with FaultRXline.</p>
             extent={{-90,-20},{-110,0}}, rotation=0)));
     PowerSystems.AC3ph.Nodes.GroundOne grd2 annotation (Placement(transformation(
             extent={{90,-20},{110,0}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Lines.OHline400kV OH400kV
+    parameter PowerSystems.Examples.Spot.Data.Lines.OHline400kV OH400kV
                                    annotation (Placement(transformation(extent=
               {{0,80},{40,100}}, rotation=0)));
     PowerSystems.Examples.Spot.Data.Transformers.TrafoStray trafo20k_400k_YD
@@ -707,7 +707,7 @@ Compare with DoublePIline.</p>
             rotation=0)));
     PowerSystems.AC3ph.Sensors.PVImeter meterF(S_nom=1000e6, V_nom=400e3)
       annotation (Placement(transformation(extent={{-10,0},{10,20}}, rotation=0)));
-    PowerSystems.Examples.Spot.Data.Lines.OHline_400kV OH_400kV
+    parameter PowerSystems.Examples.Spot.Data.Lines.OHline_400kV OH_400kV
                                      annotation (Placement(transformation(
             extent={{0,80},{40,100}}, rotation=0)));
     PowerSystems.AC3ph.Nodes.GroundOne grd1 annotation (Placement(transformation(