Skip to content

Commit 6a3298c

Browse files
dietmarwdietmarw
committed
Whitespace clean up
1 parent a0bca3a commit 6a3298c

4 files changed

Lines changed: 59 additions & 59 deletions

File tree

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ model Controller
4040
Placement(transformation(origin = {182, 90}, extent = {{-10, -10}, {10, 10}})));
4141
Modelica.Blocks.Continuous.FirstOrder QCurrentController(T = Tg, initType = Modelica.Blocks.Types.Init.InitialOutput, k = -1, y_start = -Qref / u_0) annotation (
4242
Placement(transformation(origin = {182, -70}, extent = {{-10, -10}, {10, 10}})));
43-
Modelica.Blocks.Interfaces.RealInput freq annotation (Placement(transformation(extent={{-240,130},{-200,170}}), iconTransformation(origin={-120,-60}, extent={{-20,-20},{20,20}})));
43+
Modelica.Blocks.Interfaces.RealInput freq annotation (Placement(transformation(extent={{-240,130},{-200,170}}), iconTransformation(origin={-120,-60}, extent={{-20,-20},{20,20}})));
4444
Modelica.Blocks.Sources.Constant freq_ref(k = 1) annotation (
4545
Placement(transformation(origin = {-182, 110}, extent = {{-10, -10}, {10, 10}})));
4646
Modelica.Blocks.Math.Add add2(k1 = -1) annotation (
@@ -65,9 +65,9 @@ model Controller
6565
Modelica.Blocks.Sources.Constant reactive_power_reference(k = Qref) annotation (
6666
Placement(transformation(origin = {-70, -110}, extent = {{-10, -10}, {10, 10}})));
6767
Modelica.Blocks.Interfaces.RealOutput Ip annotation (
68-
Placement(transformation(origin = {210, 90}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin={110,60}, extent = {{-10, -10}, {10, 10}})));
68+
Placement(transformation(origin = {210, 90}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin={110,60}, extent = {{-10, -10}, {10, 10}})));
6969
Modelica.Blocks.Interfaces.RealOutput Iq annotation (
70-
Placement(transformation(origin = {210, -70}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin={110,-60}, extent = {{-10, -10}, {10, 10}})));
70+
Placement(transformation(origin = {210, -70}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin={110,-60}, extent = {{-10, -10}, {10, 10}})));
7171
Modelica.Blocks.Math.Add add4 annotation (
7272
Placement(transformation(origin = {-50, 50}, extent = {{-10, -10}, {10, 10}})));
7373
parameter Types.PerUnit Qref;
@@ -89,23 +89,23 @@ model Controller
8989
Placement(transformation(origin = {150, -70}, extent = {{-10, -10}, {10, 10}})));
9090
equation
9191
connect(It, compensation.u) annotation (
92-
Line(points={{-220,-70},{-162,-70}}, color = {0, 0, 127}));
92+
Line(points={{-220,-70},{-162,-70}}, color = {0, 0, 127}));
9393
connect(compensation.y, add.u2) annotation (
9494
Line(points = {{-139, -70}, {-130.5, -70}, {-130.5, -76}, {-122, -76}}, color = {0, 0, 127}));
9595
connect(Vt, add.u1) annotation (
96-
Line(points={{-220,-10},{-128,-10},{-128,-63},{-122,-63},{-122,-64}}, color = {0, 0, 127}));
96+
Line(points={{-220,-10},{-128,-10},{-128,-63},{-122,-63},{-122,-64}}, color = {0, 0, 127}));
9797
connect(numerical_limit.u, Vt) annotation (
98-
Line(points={{-82,-10},{-220,-10}}, color = {0, 0, 127}));
98+
Line(points={{-82,-10},{-220,-10}}, color = {0, 0, 127}));
9999
connect(numerical_limit.y, division.u2) annotation (
100100
Line(points = {{-59, -10}, {-8, -10}, {-8, -36}, {78, -36}}, color = {0, 0, 127}));
101101
connect(division.y, qppriority.Iq) annotation (
102-
Line(points={{101,-30},{106,-30},{106,-5},{118,-5}}, color = {0, 0, 127}));
102+
Line(points={{101,-30},{106,-30},{106,-5},{118,-5}}, color = {0, 0, 127}));
103103
connect(division1.u2, numerical_limit.y) annotation (
104104
Line(points = {{78, 24}, {-8, 24}, {-8, -10}, {-59, -10}}, color = {0, 0, 127}));
105105
connect(division1.y, qppriority.Ip) annotation (
106-
Line(points={{101,30},{106,30},{106,5},{118,5}}, color = {0, 0, 127}));
106+
Line(points={{101,30},{106,30},{106,5},{118,5}}, color = {0, 0, 127}));
107107
connect(freq, add2.u1) annotation (
108-
Line(points={{-220,150},{-142,150}}, color = {0, 0, 127}));
108+
Line(points={{-220,150},{-142,150}}, color = {0, 0, 127}));
109109
connect(deadZone.y, frequency_droop.u) annotation (
110110
Line(points = {{-79, 144}, {-62, 144}}, color = {0, 0, 127}));
111111
connect(freq_ref.y, add2.u2) annotation (
@@ -129,66 +129,66 @@ equation
129129
connect(PCurrentController.y, Ip) annotation (
130130
Line(points = {{193, 90}, {210, 90}}, color = {0, 0, 127}));
131131
connect(active_power_reference.y, add4.u2) annotation (
132-
Line(points={{-139,30},{-80,30},{-80,44},{-62,44},{-62,44}}, color = {0, 0, 127}));
132+
Line(points={{-139,30},{-80,30},{-80,44},{-62,44},{-62,44}}, color = {0, 0, 127}));
133133
connect(frequency_droop.y, add4.u1) annotation (
134134
Line(points = {{-39, 144}, {-34, 144}, {-34, 104}, {-80, 104}, {-80, 56}, {-62, 56}}, color = {0, 0, 127}));
135135
connect(add4.y, division1.u1) annotation (
136-
Line(points={{-39,50},{52,50},{52,36},{78,36},{78,36}}, color = {0, 0, 127}));
136+
Line(points={{-39,50},{52,50},{52,36},{78,36},{78,36}}, color = {0, 0, 127}));
137137
connect(product1.y, PCurrentController.u) annotation (
138-
Line(points={{161,90},{170,90},{170,90},{170,90}}, color = {0, 0, 127}));
138+
Line(points={{161,90},{170,90},{170,90},{170,90}}, color = {0, 0, 127}));
139139
connect(product1.u2, qppriority.Ipcmd) annotation (
140-
Line(points={{138,84},{126,84},{126,20},{144,20},{144,6},{141,6},{141,5}}, color = {0, 0, 127}));
140+
Line(points={{138,84},{126,84},{126,20},{144,20},{144,6},{141,6},{141,5}}, color = {0, 0, 127}));
141141
connect(frequency_tripping.TrpLow, product.u1) annotation (
142-
Line(points={{41,155},{58,155},{58,156},{58,156}}, color = {0, 0, 127}));
142+
Line(points={{41,155},{58,155},{58,156},{58,156}}, color = {0, 0, 127}));
143143
connect(frequency_tripping.TrpHigh, product.u2) annotation (
144-
Line(points={{41,145},{58,145},{58,144},{58,144}}, color = {0, 0, 127}));
144+
Line(points={{41,145},{58,145},{58,144},{58,144}}, color = {0, 0, 127}));
145145
connect(frequency_tripping.u, freq) annotation (
146-
Line(points={{18,150},{0,150},{0,184},{-188,184},{-188,150},{-220,150}}, color = {0, 0, 127}));
146+
Line(points={{18,150},{0,150},{0,184},{-188,184},{-188,150},{-220,150}}, color = {0, 0, 127}));
147147
connect(voltage_tripping.u, Vt) annotation (
148-
Line(points={{18,110},{-128,110},{-128,-10},{-220,-10}}, color = {0, 0, 127}));
148+
Line(points={{18,110},{-128,110},{-128,-10},{-220,-10}}, color = {0, 0, 127}));
149149
connect(voltage_tripping.TrpLow, product2.u1) annotation (
150-
Line(points={{41,115},{58,115},{58,116},{58,116}}, color = {0, 0, 127}));
150+
Line(points={{41,115},{58,115},{58,116},{58,116}}, color = {0, 0, 127}));
151151
connect(voltage_tripping.TrpHigh, product2.u2) annotation (
152-
Line(points={{41,105},{56,105},{56,104},{58,104}}, color = {0, 0, 127}));
152+
Line(points={{41,105},{56,105},{56,104},{58,104}}, color = {0, 0, 127}));
153153
connect(product.y, product3.u1) annotation (
154-
Line(points={{81,150},{90,150},{90,136},{98,136},{98,136}}, color = {0, 0, 127}));
154+
Line(points={{81,150},{90,150},{90,136},{98,136},{98,136}}, color = {0, 0, 127}));
155155
connect(product2.y, product3.u2) annotation (
156-
Line(points={{81,110},{90,110},{90,124},{98,124},{98,124}}, color = {0, 0, 127}));
156+
Line(points={{81,110},{90,110},{90,124},{98,124},{98,124}}, color = {0, 0, 127}));
157157
connect(product3.y, product1.u1) annotation (
158-
Line(points={{121,130},{128,130},{128,96},{138,96},{138,96}}, color = {0, 0, 127}));
158+
Line(points={{121,130},{128,130},{128,96},{138,96},{138,96}}, color = {0, 0, 127}));
159159
connect(product4.y, QCurrentController.u) annotation (
160-
Line(points={{161,-70},{168,-70},{168,-70},{170,-70}}, color = {0, 0, 127}));
160+
Line(points={{161,-70},{168,-70},{168,-70},{170,-70}}, color = {0, 0, 127}));
161161
connect(qppriority.Iqcmd, product4.u1) annotation (
162-
Line(points={{141,-5},{144,-5},{144,-52},{130,-52},{130,-64},{138,-64},{138,-64}}, color = {0, 0, 127}));
162+
Line(points={{141,-5},{144,-5},{144,-52},{130,-52},{130,-64},{138,-64},{138,-64}}, color = {0, 0, 127}));
163163
connect(product4.u2, product3.y) annotation (
164-
Line(points={{138,-76},{112,-76},{112,100},{128,100},{128,130},{121,130},{121,130}}, color = {0, 0, 127}));
164+
Line(points={{138,-76},{112,-76},{112,100},{128,100},{128,130},{121,130},{121,130}}, color = {0, 0, 127}));
165165
annotation (
166-
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",
167-
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",
168-
horizontalAlignment = TextAlignment.Left), Text(origin = {-92, 171}, lineColor = {0, 170, 0},
169-
lineThickness = 1, extent = {{-8, 3}, {76, -9}}, textString = "Underfrequency Droop Control",
170-
horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
171-
lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Rectangle(origin = {-5, -71}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
172-
lineThickness = 1, extent = {{-85, 21}, {79, -57}}), Text(origin = {-120, -41}, lineColor = {0, 170, 0},
173-
lineThickness = 1, extent = {{30, -1}, {76, -9}}, textString = "Volt/Var Control",
174-
horizontalAlignment = TextAlignment.Left)}),
175-
Icon(graphics={ Rectangle(origin={-24.9099,25}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent={{-74.3452,75},{124.91,-125}}),
166+
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",
167+
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",
168+
horizontalAlignment = TextAlignment.Left), Text(origin = {-92, 171}, lineColor = {0, 170, 0},
169+
lineThickness = 1, extent = {{-8, 3}, {76, -9}}, textString = "Underfrequency Droop Control",
170+
horizontalAlignment = TextAlignment.Left), Rectangle(origin = {-67, 141}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
171+
lineThickness = 1, extent = {{-85, 21}, {51, -45}}), Rectangle(origin = {-5, -71}, lineColor = {0, 170, 0}, pattern = LinePattern.Dash,
172+
lineThickness = 1, extent = {{-85, 21}, {79, -57}}), Text(origin = {-120, -41}, lineColor = {0, 170, 0},
173+
lineThickness = 1, extent = {{30, -1}, {76, -9}}, textString = "Volt/Var Control",
174+
horizontalAlignment = TextAlignment.Left)}),
175+
Icon(graphics={ Rectangle(origin={-24.9099,25}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent={{-74.3452,75},{124.91,-125}}),
176176
Text(
177177
extent={{-100,100},{100,70}},
178178
textString="%name",
179-
lineColor={0,0,0}), Text(
179+
lineColor={0,0,0}), Text(
180180
extent={{-96,66},{-78,48}},
181181
lineColor={0,0,0},
182-
textString="Vt"), Text(
182+
textString="Vt"), Text(
183183
extent={{-98,8},{-78,-12}},
184184
lineColor={0,0,0},
185-
textString="It"), Text(
185+
textString="It"), Text(
186186
extent={{-96,-52},{-76,-72}},
187187
lineColor={0,0,0},
188-
textString="freq"), Text(
188+
textString="freq"), Text(
189189
extent={{70,70},{90,50}},
190190
lineColor={0,0,0},
191-
textString="Ip"), Text(
191+
textString="Ip"), Text(
192192
extent={{70,-52},{90,-72}},
193193
lineColor={0,0,0},
194194
textString="Iq")}),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ equation
4343
reinit(umax, Lv2);
4444
end when;
4545
annotation (
46-
Icon(graphics={ Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent={{-100,100},{100,-100}}), Text(origin={32,83}, extent = {{-132, 7}, {68, -13}},
46+
Icon(graphics={ Rectangle(fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid, extent={{-100,100},{100,-100}}), Text(origin={32,83}, extent = {{-132, 7}, {68, -13}},
4747
textString="%name",
48-
lineColor={0,0,0}), Text(extent={{38,59},{98,40}}, textString="TripLow"), Text(extent={{38,-40},{98,-60}}, textString="TripHigh"), Text(extent={{-96,9},{-56,-10}}, textString="Input")}));
48+
lineColor={0,0,0}), Text(extent={{38,59},{98,40}}, textString="TripLow"), Text(extent={{38,-40},{98,-60}}, textString="TripHigh"), Text(extent={{-96,9},{-56,-10}}, textString="Input")}));
4949
end GenerationTripping;

0 commit comments

Comments
 (0)