Skip to content

Commit cedb254

Browse files
sjoelundsjoelund
committed
Fixes from OpenModelica testing
- Add parameter prefix to components that were used to modify parameters - Use the InitPID enumeration instead of Init, where appropriate
1 parent d420439 commit cedb254

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎PowerSystems/Examples/Spot/DrivesAC3ph.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ The machine defines the reference-system independent of the system choice (as ne
505505
Ti=0.2,
506506
Td=0.1,
507507
controllerType=Modelica.Blocks.Types.SimpleController.PI,
508-
initType=Modelica.Blocks.Types.Init.SteadyState)
508+
initType=Modelica.Blocks.Types.InitPID.SteadyState)
509509
annotation (Placement(transformation(extent={{-60,10},{-40,30}},
510510
rotation=0)));
511511
PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm400V_30kVA syn3rdpm400_30k

‎PowerSystems/Examples/Spot/DrivesDC.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ package DrivesDC "DC drives"
3737
fileName=TableDir + "hNormProfile.tab",
3838
colData=3)
3939
annotation (Placement(transformation(extent={{60,-20},{80,0}}, rotation=0)));
40-
PowerSystems.Examples.Spot.Data.Machines.DCser1500V_1p5MVA DCs1500_1p5M
40+
parameter PowerSystems.Examples.Spot.Data.Machines.DCser1500V_1p5MVA DCs1500_1p5M
4141
annotation (Placement(transformation(extent={{-60,80},{-20,100}},
4242
rotation=0)));
4343

@@ -115,7 +115,7 @@ package DrivesDC "DC drives"
115115
slope_perc=2.5,
116116
cFrict={50,15})
117117
annotation (Placement(transformation(extent={{60,-20},{80,0}}, rotation=0)));
118-
PowerSystems.Examples.Spot.Data.Machines.DCpar1500V_1p5MVA DCp1500_1p5M
118+
parameter PowerSystems.Examples.Spot.Data.Machines.DCpar1500V_1p5MVA DCp1500_1p5M
119119
annotation (Placement(transformation(extent={{-60,80},{-20,100}},
120120
rotation=0)));
121121

@@ -189,7 +189,7 @@ package DrivesDC "DC drives"
189189
useSupport=false)
190190
annotation (Placement(transformation(extent={{90,20},{70,40}},
191191
rotation=0)));
192-
PowerSystems.Examples.Spot.Data.Machines.DCpm100V_1kVA DCpm100_1k
192+
parameter PowerSystems.Examples.Spot.Data.Machines.DCpm100V_1kVA DCpm100_1k
193193
annotation (Placement(transformation(
194194
extent={{-60,80},{-20,100}}, rotation=0)));
195195

@@ -279,7 +279,7 @@ package DrivesDC "DC drives"
279279
useSupport=false)
280280
annotation (Placement(transformation(extent={{90,20},{70,40}},
281281
rotation=0)));
282-
PowerSystems.Examples.Spot.Data.Machines.BLDC100V_1kVA bldc100_1k
282+
parameter PowerSystems.Examples.Spot.Data.Machines.BLDC100V_1kVA bldc100_1k
283283
annotation (Placement(transformation(
284284
extent={{-60,80},{-20,100}}, rotation=0)));
285285
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A

‎PowerSystems/Examples/Spot/GenerationAC3ph.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
13381338
Td=0.1,
13391339
Ti=0.5,
13401340
k=1/vDC_nom,
1341-
initType=Modelica.Blocks.Types.Init.SteadyState)
1341+
initType=Modelica.Blocks.Types.InitPID.SteadyState)
13421342
annotation (Placement(transformation(extent={{40,20},{20,40}},
13431343
rotation=0)));
13441344
Modelica.Blocks.Sources.Constant set_vDC(k=vDC_nom)
@@ -1486,7 +1486,7 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
14861486
Modelica.Blocks.Continuous.LimPID PI_vDC(
14871487
Td=0.05,
14881488
controllerType=Modelica.Blocks.Types.SimpleController.PI,
1489-
initType=Modelica.Blocks.Types.Init.SteadyState,
1489+
initType=Modelica.Blocks.Types.InitPID.SteadyState,
14901490
Ti=0.1,
14911491
k=0.3*I_nom/vDC_nom,
14921492
yMax=1.4*I_nom)
@@ -1495,11 +1495,11 @@ annotation (Placement(transformation(extent={{-100,80},{-80,100}}, rotation=0)))
14951495
Modelica.Blocks.Math.Gain gain(k=-1) "generator: negative torque tau_act"
14961496
annotation (Placement(transformation(
14971497
extent={{-40,20},{-20,40}}, rotation=0)));
1498-
PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm560V_100kVA syn3rdpm560_100k(
1498+
parameter PowerSystems.Examples.Spot.Data.Machines.Synchron3rd_pm560V_100kVA syn3rdpm560_100k(
14991499
neu_iso=true)
15001500
annotation (Placement(transformation(extent={{-60,80},{-20,100}},
15011501
rotation=0)));
1502-
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC1kV_100A idealSC1k_100(
1502+
parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC1kV_100A idealSC1k_100(
15031503
Vf=0)
15041504
annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
15051505

‎PowerSystems/Examples/Spot/InvertersAC1ph_DC.mo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
4141
extent={{90,0},{110,20}}, rotation=0)));
4242
PowerSystems.Common.Thermal.BdCondV bdCond(m=2) annotation (Placement(
4343
transformation(extent={{10,20},{30,40}}, rotation=0)));
44-
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
44+
parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
4545
annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
4646

4747
equation
@@ -316,7 +316,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
316316
extent={{80,-20},{100,0}}, rotation=0)));
317317
PowerSystems.Common.Thermal.BdCondV bdCond(m=1) annotation (Placement(
318318
transformation(extent={{-30,0},{-10,20}}, rotation=0)));
319-
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
319+
parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
320320
annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
321321

322322
equation
@@ -400,7 +400,7 @@ package InvertersAC1ph_DC "Inverters 1 phase and DC"
400400
extent={{-80,-20},{-100,0}}, rotation=0)));
401401
PowerSystems.Common.Thermal.BdCondV bdCond(m=2) annotation (Placement(
402402
transformation(extent={{-10,0},{10,20}}, rotation=0)));
403-
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
403+
parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
404404
annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
405405

406406
equation

‎PowerSystems/Examples/Spot/InvertersAC3ph.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package InvertersAC3ph "Inverters dqo"
4545
0},{110,20}}, rotation=0)));
4646
PowerSystems.Common.Thermal.BdCondV bdCond(m=3) annotation (Placement(
4747
transformation(extent={{10,20},{30,40}}, rotation=0)));
48-
PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
48+
parameter PowerSystems.Examples.Spot.Data.Semiconductors.IdealSC100V_10A idealSC100V_10A
4949
annotation (Placement(transformation(extent={{0,80},{40,100}}, rotation=0)));
5050

5151
equation

‎PowerSystems/Examples/Spot/TransmissionAC3ph.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ Compare with FaultRXline.</p>
594594
extent={{-90,-20},{-110,0}}, rotation=0)));
595595
PowerSystems.AC3ph.Nodes.GroundOne grd2 annotation (Placement(transformation(
596596
extent={{90,-20},{110,0}}, rotation=0)));
597-
PowerSystems.Examples.Spot.Data.Lines.OHline400kV OH400kV
597+
parameter PowerSystems.Examples.Spot.Data.Lines.OHline400kV OH400kV
598598
annotation (Placement(transformation(extent=
599599
{{0,80},{40,100}}, rotation=0)));
600600
PowerSystems.Examples.Spot.Data.Transformers.TrafoStray trafo20k_400k_YD
@@ -707,7 +707,7 @@ Compare with DoublePIline.</p>
707707
rotation=0)));
708708
PowerSystems.AC3ph.Sensors.PVImeter meterF(S_nom=1000e6, V_nom=400e3)
709709
annotation (Placement(transformation(extent={{-10,0},{10,20}}, rotation=0)));
710-
PowerSystems.Examples.Spot.Data.Lines.OHline_400kV OH_400kV
710+
parameter PowerSystems.Examples.Spot.Data.Lines.OHline_400kV OH_400kV
711711
annotation (Placement(transformation(
712712
extent={{0,80},{40,100}}, rotation=0)));
713713
PowerSystems.AC3ph.Nodes.GroundOne grd1 annotation (Placement(transformation(

0 commit comments

Comments
 (0)