Skip to content

Commit 765a8f7

Browse files
dietmarwdietmarw
committed
Correct class name
1 parent 7dfb5eb commit 765a8f7

3 files changed

Lines changed: 30 additions & 22 deletions

File tree

‎OpenIPSL/Electrical/Solar/PowerFactory/WECC/PVD1/Controller.mo‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ model Controller
3434
extent={{-10,-10},{10,10}})));
3535
Modelica.Blocks.Math.Division division annotation (
3636
Placement(transformation(origin = {90, -30}, extent = {{-10, -10}, {10, 10}})));
37-
OpenIPSL.Electrical.Solar.PowerFactory.WECC.PVD1.QPPriority qppriority(Imax = Imax, PqFlag = PqFlag) annotation (
37+
OpenIPSL.Electrical.Solar.PowerFactory.WECC.PVD1.PQPriority qppriority(Imax = Imax, PqFlag = PqFlag) annotation (
3838
Placement(transformation(origin = {130, 0}, extent = {{-10, -10}, {10, 10}})));
3939
Modelica.Blocks.Math.Division division1 annotation (
4040
Placement(transformation(origin = {90, 30}, extent = {{-10, -10}, {10, 10}})));
@@ -102,11 +102,11 @@ equation
102102
connect(numerical_limit.y, division.u2) annotation (
103103
Line(points = {{-59, -10}, {-8, -10}, {-8, -36}, {78, -36}}, color = {0, 0, 127}));
104104
connect(division.y, qppriority.Iq) annotation (
105-
Line(points = {{101, -30}, {106, -30}, {106, -5}, {120, -5}}, color = {0, 0, 127}));
105+
Line(points={{101,-30},{106,-30},{106,-5},{118,-5}}, color = {0, 0, 127}));
106106
connect(division1.u2, numerical_limit.y) annotation (
107107
Line(points = {{78, 24}, {-8, 24}, {-8, -10}, {-59, -10}}, color = {0, 0, 127}));
108108
connect(division1.y, qppriority.Ip) annotation (
109-
Line(points = {{101, 30}, {106, 30}, {106, 5}, {120, 5}}, color = {0, 0, 127}));
109+
Line(points={{101,30},{106,30},{106,5},{118,5}}, color = {0, 0, 127}));
110110
connect(freq, add2.u1) annotation (
111111
Line(points = {{-200, 150}, {-142, 150}}, color = {0, 0, 127}));
112112
connect(deadZone.y, frequency_droop.u) annotation (
@@ -132,42 +132,50 @@ equation
132132
connect(PCurrentController.y, Ip) annotation (
133133
Line(points = {{193, 90}, {210, 90}}, color = {0, 0, 127}));
134134
connect(active_power_reference.y, add4.u2) annotation (
135-
Line(points = {{-138, 30}, {-80, 30}, {-80, 44}, {-62, 44}, {-62, 44}}, color = {0, 0, 127}));
135+
Line(points={{-139,30},{-80,30},{-80,44},{-62,44},{-62,44}}, color = {0, 0, 127}));
136136
connect(frequency_droop.y, add4.u1) annotation (
137137
Line(points = {{-39, 144}, {-34, 144}, {-34, 104}, {-80, 104}, {-80, 56}, {-62, 56}}, color = {0, 0, 127}));
138138
connect(add4.y, division1.u1) annotation (
139-
Line(points = {{-38, 50}, {52, 50}, {52, 36}, {78, 36}, {78, 36}}, color = {0, 0, 127}));
139+
Line(points={{-39,50},{52,50},{52,36},{78,36},{78,36}}, color = {0, 0, 127}));
140140
connect(product1.y, PCurrentController.u) annotation (
141-
Line(points = {{162, 90}, {170, 90}, {170, 90}, {170, 90}}, color = {0, 0, 127}));
141+
Line(points={{161,90},{170,90},{170,90},{170,90}}, color = {0, 0, 127}));
142142
connect(product1.u2, qppriority.Ipcmd) annotation (
143-
Line(points = {{138, 84}, {126, 84}, {126, 20}, {144, 20}, {144, 6}, {142, 6}, {142, 6}}, color = {0, 0, 127}));
143+
Line(points={{138,84},{126,84},{126,20},{144,20},{144,6},{141,6},{141,5}}, color = {0, 0, 127}));
144144
connect(frequency_tripping.TrpLow, product.u1) annotation (
145-
Line(points = {{42, 156}, {58, 156}, {58, 156}, {58, 156}}, color = {0, 0, 127}));
145+
Line(points={{41,155},{58,155},{58,156},{58,156}}, color = {0, 0, 127}));
146146
connect(frequency_tripping.TrpHigh, product.u2) annotation (
147-
Line(points = {{42, 144}, {58, 144}, {58, 144}, {58, 144}}, color = {0, 0, 127}));
147+
Line(points={{41,145},{58,145},{58,144},{58,144}}, color = {0, 0, 127}));
148148
connect(frequency_tripping.u, freq) annotation (
149149
Line(points = {{20, 150}, {0, 150}, {0, 184}, {-188, 184}, {-188, 150}, {-200, 150}}, color = {0, 0, 127}));
150150
connect(voltage_tripping.u, Vt) annotation (
151151
Line(points = {{20, 110}, {-128, 110}, {-128, -10}, {-200, -10}}, color = {0, 0, 127}));
152152
connect(voltage_tripping.TrpLow, product2.u1) annotation (
153-
Line(points = {{42, 116}, {58, 116}, {58, 116}, {58, 116}}, color = {0, 0, 127}));
153+
Line(points={{41,115},{58,115},{58,116},{58,116}}, color = {0, 0, 127}));
154154
connect(voltage_tripping.TrpHigh, product2.u2) annotation (
155-
Line(points = {{42, 106}, {56, 106}, {56, 104}, {58, 104}}, color = {0, 0, 127}));
155+
Line(points={{41,105},{56,105},{56,104},{58,104}}, color = {0, 0, 127}));
156156
connect(product.y, product3.u1) annotation (
157-
Line(points = {{82, 150}, {90, 150}, {90, 136}, {98, 136}, {98, 136}}, color = {0, 0, 127}));
157+
Line(points={{81,150},{90,150},{90,136},{98,136},{98,136}}, color = {0, 0, 127}));
158158
connect(product2.y, product3.u2) annotation (
159-
Line(points = {{82, 110}, {90, 110}, {90, 124}, {98, 124}, {98, 124}}, color = {0, 0, 127}));
159+
Line(points={{81,110},{90,110},{90,124},{98,124},{98,124}}, color = {0, 0, 127}));
160160
connect(product3.y, product1.u1) annotation (
161-
Line(points = {{122, 130}, {128, 130}, {128, 96}, {138, 96}, {138, 96}}, color = {0, 0, 127}));
161+
Line(points={{121,130},{128,130},{128,96},{138,96},{138,96}}, color = {0, 0, 127}));
162162
connect(product4.y, QCurrentController.u) annotation (
163-
Line(points = {{162, -70}, {168, -70}, {168, -70}, {170, -70}}, color = {0, 0, 127}));
163+
Line(points={{161,-70},{168,-70},{168,-70},{170,-70}}, color = {0, 0, 127}));
164164
connect(qppriority.Iqcmd, product4.u1) annotation (
165-
Line(points = {{142, -4}, {144, -4}, {144, -52}, {130, -52}, {130, -64}, {138, -64}, {138, -64}}, color = {0, 0, 127}));
165+
Line(points={{141,-5},{144,-5},{144,-52},{130,-52},{130,-64},{138,-64},{138,-64}}, color = {0, 0, 127}));
166166
connect(product4.u2, product3.y) annotation (
167-
Line(points = {{138, -76}, {112, -76}, {112, 100}, {128, 100}, {128, 130}, {122, 130}, {122, 130}}, color = {0, 0, 127}));
167+
Line(points={{138,-76},{112,-76},{112,100},{128,100},{128,130},{121,130},{121,130}}, color = {0, 0, 127}));
168168
annotation (
169-
Diagram(coordinateSystem(extent = {{-200, -200}, {200, 200}}, initialScale = 0.05), graphics = {Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block", horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash, lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block", horizontalAlignment = TextAlignment.Left), Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block", horizontalAlignment = TextAlignment.Left), Text(origin = {-92, 171}, lineColor = {0, 170, 0}, lineThickness = 1, extent = {{-8, 3}, {76, -9}}, textString = "Underfrequency Droop Control", horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash, lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Rectangle(origin = {-5, -71}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash, lineThickness = 1, extent = {{-85, 21}, {79, -57}}), Text(origin = {-120, -41}, lineColor = {0, 170, 0}, lineThickness = 1, extent = {{30, -1}, {76, -9}}, textString = "Volt/Var Control", horizontalAlignment = TextAlignment.Left)}),
170-
Icon(coordinateSystem(extent = {{-200, -200}, {200, 200}}, initialScale = 0.05), graphics = {Rectangle(origin = {-52, 50}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-150, 150}, {252, -250}}), Text(origin = {26, 194}, extent = {{-228, -34}, {174, 6}}, textString = "PVD1")}),
169+
Diagram(coordinateSystem(extent = {{-200, -200}, {200, 200}}, initialScale = 0.05), graphics={ Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block", horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash, lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block",
170+
horizontalAlignment = TextAlignment.Left), Text(origin = {-186, 179}, lineColor = {255, 0, 0}, extent = {{-8, 3}, {76, -9}}, textString = "Frequency filtering has to be done outside of this block",
171+
horizontalAlignment = TextAlignment.Left), Text(origin = {-92, 171}, lineColor = {0, 170, 0},
172+
lineThickness = 1, extent = {{-8, 3}, {76, -9}}, textString = "Underfrequency Droop Control",
173+
horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
174+
lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Rectangle(origin = {-5, -71}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
175+
lineThickness = 1, extent = {{-85, 21}, {79, -57}}), Text(origin = {-120, -41}, lineColor = {0, 170, 0},
176+
lineThickness = 1, extent = {{30, -1}, {76, -9}}, textString = "Volt/Var Control",
177+
horizontalAlignment = TextAlignment.Left)}),
178+
Icon(coordinateSystem(extent = {{-200, -200}, {200, 200}}, initialScale = 0.05), graphics={ Rectangle(origin = {-52, 50}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent = {{-150, 150}, {252, -250}}), Text(origin = {26, 194}, extent = {{-228, -34}, {174, 6}}, textString = "PVD1")}),
171179
experiment(StartTime = 0, StopTime = 1, Tolerance = 1e-6, Interval = 0.002),
172180
__OpenModelica_simulationFlags(lv = "LOG_STATS", outputFormat = "mat", s = "dassl"));
173181
end Controller;

OpenIPSL/Electrical/Solar/PowerFactory/WECC/PVD1/QPPriority.mo renamed to OpenIPSL/Electrical/Solar/PowerFactory/WECC/PVD1/PQPriority.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Solar.PowerFactory.WECC.PVD1;
2-
model QPPriority
2+
model PQPriority
33
parameter Boolean PqFlag;
44
parameter Types.PerUnit Imax;
55
Modelica.Blocks.Interfaces.RealInput Ip annotation (
@@ -67,4 +67,4 @@ equation
6767
textString="%name",
6868
lineColor={0,0,0}), Text(extent={{-100,60},{-60,40}}, textString="Ipref"), Text(extent={{-100,-40},{-60,-60}}, textString="Iqref"), Text(extent={{58,60},{98,40}}, textString="Ipcmd"), Text(extent={{58,-40},{98,-60}},
6969
textString="Iqcmd")}));
70-
end QPPriority;
70+
end PQPriority;

‎OpenIPSL/Electrical/Solar/PowerFactory/WECC/PVD1/package.order‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Plant_PVD1
22
Controller
33
GenerationTripping
4-
QPPriority
4+
PQPriority

0 commit comments

Comments
 (0)