Skip to content

Commit ac6dd83

Browse files
dietmarwdietmarw
committed
Annotation and white space clean up
1 parent 3fc580c commit ac6dd83

File tree

16 files changed

+63
-72
lines changed

16 files changed

+63
-72
lines changed

‎OpenIPSL/Electrical/Controls/PSSE/ES/AC7B.mo‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,14 @@ reactances";
101101
origin={157,30})));
102102
Modelica.Blocks.Sources.Constant const(k=K_E)
103103
annotation (Placement(transformation(extent={{10,-10},{-10,10}},
104-
rotation=0,
105104
origin={162,0})));
106105
Modelica.Blocks.Math.Add DiffV3
107106
annotation (Placement(transformation(extent={{114,18},{94,38}})));
108107
Modelica.Blocks.Math.Division division annotation (Placement(transformation(
109108
extent={{-10,-10},{10,10}},
110109
rotation=270,
111110
origin={52,6})));
112-
Modelica.Blocks.Math.Gain gain5(k=K_D) annotation (Placement(
111+
Modelica.Blocks.Math.Gain gain5(k=K_D) annotation (Placement(
113112
transformation(
114113
extent={{-10,-10},{10,10}},
115114
rotation=90,
@@ -121,7 +120,7 @@ reactances";
121120
annotation (Placement(transformation(extent={{-10,-10},{10,10}},
122121
rotation=90,
123122
origin={-72,70})));
124-
NonElectrical.Continuous.PID_No_Windup pID_No_Windup(
123+
NonElectrical.Continuous.PID_No_Windup pID_No_Windup(
125124
K_P=K_PR,
126125
K_I=K_IR,
127126
K_D=K_DR,
@@ -191,7 +190,7 @@ initial equation
191190

192191
equation
193192
connect(DiffV.u2, TransducerDelay.y) annotation (Line(points={{-122,-6},{-134,
194-
-6},{-134,0},{-147,0}}, color={0,0,127}));
193+
-6},{-134,0},{-147,0}}, color={0,0,127}));
195194
connect(TransducerDelay.u, ECOMP)
196195
annotation (Line(points={{-170,0},{-200,0}}, color={0,0,127}));
197196
connect(gain1.y, add.u2)
@@ -202,9 +201,9 @@ equation
202201
connect(product.u1, gain4.y) annotation (Line(points={{172,116},{172,128},{127,
203202
128},{127,140}}, color={0,0,127}));
204203
connect(gain2.y, add.u1) annotation (Line(points={{-6,-59},{-6,-12},{-12,-12},
205-
{-12,34}}, color={0,0,127}));
204+
{-12,34}}, color={0,0,127}));
206205
connect(FEMAX.y,DiffV2. u1) annotation (Line(points={{-53,-14},{-40,-14},{-40,
207-
-18}}, color={0,0,127}));
206+
-18}}, color={0,0,127}));
208207
connect(gain5.y, DiffV2.u2) annotation (Line(points={{-28,-139},{-28,-94},{-44,
209208
-94},{-44,-30},{-40,-30}},
210209
color={0,0,127}));
@@ -220,10 +219,10 @@ equation
220219
connect(rectifierCommutationVoltageDrop.V_EX,
221220
rotatingExciterWithDemagnetizationVarLim.EFD) annotation (Line(points={{148.3,
222221
-51},{146,-51},{146,-48},{138,-48},{138,-34},{118,-34},{118,-35},{83.875,
223-
-35}}, color={0,0,
222+
-35}}, color={0,0,
224223
127}));
225224
connect(gain2.u, EFD) annotation (Line(points={{-6,-82},{196,-82},{196,0},{210,
226-
0}}, color={0,0,127}));
225+
0}}, color={0,0,127}));
227226
connect(rotatingExciterWithDemagnetizationVarLim.V_FE, gain1.u) annotation (
228227
Line(points={{50.125,-44.375},{50.125,-52},{50,-52},{50,-60},{16,-60},{16,
229228
-56}}, color={0,0,127}));
@@ -248,7 +247,7 @@ equation
248247
connect(pID_No_Windup.y, add1.u1) annotation (Line(points={{-7.7,111},{6,111},
249248
{6,116},{18,116}}, color={0,0,127}));
250249
connect(imDerivativeLag.u, gain1.u) annotation (Line(points={{-52,-104},{50,-104},
251-
{50,-60},{16,-60},{16,-56}}, color={0,0,127}));
250+
{50,-60},{16,-60},{16,-56}}, color={0,0,127}));
252251
connect(Upper_Limit.y, variableLimiter.limit1) annotation (Line(points={{169,82},
253252
{152,82},{152,72},{132,72}}, color={0,0,127}));
254253
connect(gain.y, variableLimiter.limit2) annotation (Line(points={{161,46},{152,
@@ -274,19 +273,19 @@ equation
274273
annotation (Line(points={{109,64},{68,64},{68,60},{32,60},{32,-35},{50.125,
275274
-35}}, color={0,0,127}));
276275
connect(pI_No_Windup.y, product.u2) annotation (Line(points={{105.9,104},{172,
277-
104}}, color={0,0,127}));
276+
104}}, color={0,0,127}));
278277
connect(add1.y, pI_No_Windup.u)
279278
annotation (Line(points={{41,110},{46,110},{46,104},{62.2,104}},
280279
color={0,0,127}));
281280
connect(add3.y, pID_No_Windup.u) annotation (Line(points={{-72,81},{-72,111},{
282281
-60.6,111}}, color={0,0,127}));
283282
annotation (Diagram(coordinateSystem(extent={{-200,-200},{200,160}})),
284-
Icon(graphics={ Text(
283+
Icon(graphics={ Text(
285284
extent={{-96,-60},{-26,-80}},
286285
lineColor={28,108,200},
287286
textString="
288287
289-
"), Text(
288+
"), Text(
290289
extent={{-104,90},{-22,70}},
291290
lineColor={28,108,200},
292291
textString="ETERM"),

‎OpenIPSL/Electrical/Controls/PSSE/ES/AC8B.mo‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,17 @@ equation
146146
-69},{198,-69},{198,0},{210,0}}, color={0,0,127}));
147147
connect(rectifierCommutationVoltageDrop.V_EX,
148148
rotatingExciterWithDemagnetizationVarLim.EFD) annotation (Line(points={{86.3,
149-
-69},{86.3,-70},{58,-70},{58,-44},{38.75,-44}}, color={0,0,
149+
-69},{86.3,-70},{58,-70},{58,-44},{38.75,-44}}, color={0,0,
150150
127}));
151151
connect(FEMAX.y,DiffV2. u1) annotation (Line(points={{89,50},{76,50},{76,44},{
152-
62,44}}, color={0,0,127}));
152+
62,44}}, color={0,0,127}));
153153
connect(DiffV3.u1,const. y) annotation (Line(points={{122,16},{144,16},{144,30},
154-
{159,30}}, color={0,0,127}));
154+
{159,30}}, color={0,0,127}));
155155
connect(DiffV3.u2,se1. VE_OUT) annotation (Line(points={{122,4},{137.46,4}},
156156
color={0,0,127}));
157157
connect(rotatingExciterWithDemagnetizationVarLim.I_C, simpleLagLim.y)
158158
annotation (Line(points={{-10.75,-44},{-48,-44},{-48,54},{-8,54},{-8,108},{-13,
159-
108}}, color={0,0,127}));
159+
108}}, color={0,0,127}));
160160
connect(VUEL, VS.u2) annotation (Line(points={{-130,-200},{-130,-106},{-138,-106},
161161
{-138,-84}}, color={0,0,127}));
162162
connect(VOEL, VS.u3) annotation (Line(points={{-70,-200},{-70,-168},{-120,-168},
@@ -189,7 +189,7 @@ equation
189189
{22,16}}, color={0,0,127}));
190190
connect(DiffV3.y, div0block.u2)
191191
annotation (Line(points={{99,10},{30,10},{30,4},{22,4}}, color={0,0,127}));
192-
annotation ( Icon(
192+
annotation ( Icon(
193193
graphics={Text(
194194
extent={{-42,152},{36,82}},
195195
lineColor={28,108,200},

‎OpenIPSL/Electrical/Controls/PSSE/ES/DC4B.mo‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ model DC4B "DC4B Excitation System [IEEE2005]"
1313
parameter Types.PerUnit V_RMIN=-7 "Minimum regulator output";
1414
parameter Types.PerUnit K_A=10.8 "Voltage regulator gain";
1515
parameter Types.Time T_A=0.01 "Voltage regulator time constant (sec)";
16-
parameter Types.PerUnit K_E=1 "Exciter field proportional constant";
16+
parameter Types.PerUnit K_E=1 "Exciter field proportional constant";
1717
parameter Types.Time T_E=0.8 "Exciter field time constant";
1818
parameter Types.PerUnit K_F=0.03 "Rate feedback excitation system stabilizer gain";
1919
parameter Types.Time T_F=1 "Rate feedback time constant";
20-
parameter Types.PerUnit E_1=2.4 "Exciter output voltage for saturation factor S_E(E_1)";
20+
parameter Types.PerUnit E_1=2.4 "Exciter output voltage for saturation factor S_E(E_1)";
2121
parameter Types.PerUnit S_EE_1=0.03 "Exciter saturation factor at exciter output voltage E1";
2222
parameter Types.PerUnit E_2=5.0000 "Exciter output voltage for saturation factor S_E(E_2)";
2323
parameter Types.PerUnit S_EE_2=0.50000 "Exciter saturation factor at exciter output voltage E2";
@@ -70,17 +70,17 @@ model DC4B "DC4B Excitation System [IEEE2005]"
7070
extent={{-10,-10},{10,10}},
7171
rotation=90,
7272
origin={-130,-80})));
73-
Modelica.Blocks.Math.Gain gain(k=V_RMIN) annotation (Placement(
73+
Modelica.Blocks.Math.Gain gain(k=V_RMIN) annotation (Placement(
7474
transformation(
7575
extent={{-10,-10},{10,10}},
7676
rotation=90,
7777
origin={132,-150})));
78-
Modelica.Blocks.Math.Gain gain1(k=V_RMAX) annotation (Placement(
78+
Modelica.Blocks.Math.Gain gain1(k=V_RMAX) annotation (Placement(
7979
transformation(
8080
extent={{-10,-10},{10,10}},
8181
rotation=90,
8282
origin={160,-150})));
83-
NonElectrical.Continuous.PID_No_Windup pID_No_Windup(
83+
NonElectrical.Continuous.PID_No_Windup pID_No_Windup(
8484
K_P=K_PR,
8585
K_I=K_IR,
8686
K_D=K_DR,
@@ -135,7 +135,7 @@ equation
135135
connect(TransducerDelay.y, DiffV.u2) annotation (Line(points={{-145,0},{-134,
136136
0},{-134,-6},{-122,-6}}, color={0,0,127}));
137137
connect(VOTHSG, Vpss_Add.u1) annotation (Line(points={{-200,90},{-96,90},{-96,
138-
44},{-90,44}}, color={0,0,127}));
138+
44},{-90,44}}, color={0,0,127}));
139139
connect(DiffV.y, Vpss_Add.u2)
140140
annotation (Line(points={{-99,0},{-94,0},{-94,32},{-90,32}},
141141
color={0,0,127}));
@@ -154,19 +154,19 @@ equation
154154
connect(VUEL_VOEL_add.y, add3_1.u2) annotation (Line(points={{-130,-69},{-130,
155155
-20},{-80,-20},{-80,0},{-60,0}}, color={0,0,127}));
156156
connect(derivativeLag.y, add3_1.u3) annotation (Line(points={{-45,-76},{-76,-76},
157-
{-76,-8},{-60,-8}}, color={0,0,127}));
157+
{-76,-8},{-60,-8}}, color={0,0,127}));
158158
connect(VT,gain. u) annotation (Line(points={{152,-200},{152,-172},{132,-172},
159159
{132,-162}},
160160
color={0,0,127}));
161161
connect(gain1.u,gain. u) annotation (Line(points={{160,-162},{160,-172},{132,-172},
162162
{132,-162}},
163163
color={0,0,127}));
164164
connect(product1.u1, gain.u) annotation (Line(points={{70,130},{52,130},{52,146},
165-
{194,146},{194,-184},{132,-184},{132,-162}}, color={0,0,127}));
165+
{194,146},{194,-184},{132,-184},{132,-162}}, color={0,0,127}));
166166
connect(add3_1.y, pID_No_Windup.u) annotation (Line(points={{-37,0},{-24.6,0}},
167167
color={0,0,127}));
168168
connect(pID_No_Windup.y, hV_GATE.u2) annotation (Line(points={{28.3,0},{40,0},
169-
{40,-32},{2,-32},{2,-53.2},{13.2,-53.2}}, color=
169+
{40,-32},{2,-32},{2,-53.2},{13.2,-53.2}}, color=
170170
{0,0,127}));
171171
connect(switch_VUEL.y2, hV_GATE.u1) annotation (Line(points={{-124,-139},
172172
{-124,-122},{-98,-122},{-98,-44.8},{13.2,-44.8}}, color={0,0,
@@ -176,7 +176,7 @@ equation
176176
connect(switch_VOEL.y2, lV_GATE.u1) annotation (Line(points={{-64,-139},
177177
{-64,-100},{52,-100},{52,-40.8},{61.2,-40.8}}, color={0,0,127}));
178178
connect(lV_GATE.y, product1.u2) annotation (Line(points={{93.4,-45},{98,-45},{
179-
98,-20},{52,-20},{52,118},{70,118}}, color={0,0,127}));
179+
98,-20},{52,-20},{52,118},{70,118}}, color={0,0,127}));
180180
connect(gain.y, simpleLagLimVar.outMin) annotation (Line(points={{132,-139},{132,
181181
-36},{106,-36},{106,-8},{78,-8},{78,48}}, color={0,0,127}));
182182
connect(gain1.y, simpleLagLimVar.outMax) annotation (Line(points={{160,-139},{

‎OpenIPSL/Electrical/Controls/PSSE/ES/ESURRY.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ equation
145145
color={0,0,127}));
146146
connect(rotatingExciterWithDemagnetization.EFD,
147147
rectifierCommutationVoltageDrop.V_EX) annotation (Line(points={{133.25,0},{157,
148-
0}}, color={0,0,127}));
148+
0}}, color={0,0,127}));
149149
connect(rectifierCommutationVoltageDrop.EFD, EFD)
150150
annotation (Line(points={{179,0},{210,0}}, color={0,0,127}));
151151
connect(gain1.y,add3_3. u2)
@@ -179,7 +179,7 @@ equation
179179
annotation (
180180
Diagram(coordinateSystem(extent={{-200,-200},{200,160}})),
181181
Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
182-
graphics={ Text(
182+
graphics={ Text(
183183
extent={{-104,172},{102,88}},
184184
lineColor={14,8,200},
185185
textString="ESURRY")}),

‎OpenIPSL/Electrical/Controls/PSSE/ES/EXBAS.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ equation
156156
connect(leadLag1.y, imDerivativeLag.u)
157157
annotation (Line(points={{93,-82},{84,-82}}, color={0,0,127}));
158158
connect(imDerivativeLag.y, add3_2.u3) annotation (Line(points={{61,-82},{-60,-82},
159-
{-60,-40}}, color={0,0,127}));
159+
{-60,-40}}, color={0,0,127}));
160160
connect(add.u2, gain.y) annotation (Line(points={{20,-32},{14,-32},{14,-38},{9,
161161
-38}}, color={0,0,127}));
162162
connect(add.u1, integrator.y)
@@ -171,7 +171,7 @@ equation
171171
graphics={Text(
172172
extent={{-66,194},{70,158}},
173173
textColor={28,108,200},
174-
textString="EXBAS")}), Icon(
174+
textString="EXBAS")}), Icon(
175175
coordinateSystem(extent={{-100,-100},{100,100}}), graphics={Text(
176176
extent={{-58,142},{76,98}},
177177
textColor={28,108,200},

‎OpenIPSL/Electrical/Controls/PSSE/TG/BaseClasses/WEHGOV/Governor.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ equation
235235
annotation (Line(points={{-200,-140},{-122,-140}}, color={0,0,127}));
236236
annotation (Icon(graphics={Rectangle(extent={{-100,
237237
-100},{100,100}},
238-
lineColor={28,108,200}), Text(
238+
lineColor={28,108,200}), Text(
239239
extent={{-84,60},{88,-56}},
240240
textColor={28,108,200},
241241
textString="Governor")}),

‎OpenIPSL/Electrical/Controls/PSSE/TG/BaseClasses/WEHGOV/Turbine.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ model Turbine "WEHGOV turbine dynamics"
4141
annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
4242
Modelica.Blocks.Sources.Constant Turbine_Head_ref(k=1)
4343
annotation (Placement(transformation(extent={{-60,-76},{-40,-56}})));
44-
Modelica.Blocks.Continuous.Integrator integrator(k=1/TW, initType=
44+
Modelica.Blocks.Continuous.Integrator integrator(k=1/TW, initType=
4545
Modelica.Blocks.Types.Init.InitialOutput,
4646
y_start=f0)
4747
annotation (Placement(transformation(extent={{20,-70},{40,-50}})));

‎OpenIPSL/Electrical/Controls/PSSE/TG/HYGOV.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ equation
152152
extent={{-100,160},{100,100}},
153153
lineColor={28,108,200},
154154
textString="HYGOV")}),
155-
Documentation(info="<html>
155+
Documentation(info="<html>
156156
<p> This is a hydro turbine-governor model. </p>
157157
<p> If compared to the original PSSE implementation one will notice that the initial water head value, <code>h0</code>, is declared as a parameter.
158-
This allows the user to modify it, if required, in order to perform adequate studies.
158+
This allows the user to modify it, if required, in order to perform adequate studies.
159159
The user should leave it in its default value (<code>1</code>) if they do not have any information on water head value, or if they do not wish to modify the parameter.</p>
160160
</html>",revisions="<html>
161161
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\">

‎OpenIPSL/Electrical/Controls/PSSE/TG/WEHGOV.mo‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ model WEHGOV "Woodward Electric Hydro Governor Model [PSSE-MODELS]"
102102
Pmech5=Pmech5,
103103
Pmech6=Pmech6) annotation (Placement(transformation(extent={{-56,-20},{-16,20}})));
104104

105-
Modelica.Blocks.Sources.Constant P_ref(k=Pref) annotation (Placement(transformation(origin={-78,30}, extent = {{-10, -10}, {10, 10}})));
105+
Modelica.Blocks.Sources.Constant P_ref(k=Pref) annotation (Placement(transformation(origin={-78,30}, extent = {{-10, -10}, {10, 10}})));
106106
Modelica.Blocks.Interfaces.RealInput SPEED
107107
annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
108108
iconTransformation(extent={{-100,40},{-60,80}})));
@@ -124,13 +124,13 @@ initial equation
124124
Pref = R_PERM_PE*Pe0;
125125
equation
126126
connect(Governor.Gate_Position, Turbine.Gate_Position) annotation (Line(
127-
points={{-14,0},{18,0},{18,16},{28,16}}, color={0,0,127}));
127+
points={{-14,0},{18,0},{18,16},{28,16}}, color={0,0,127}));
128128
connect(P_ref.y, Governor.PREF) annotation (Line(points={{-67,30},{-60,30},{
129-
-60,16}}, color={0,0,127}));
129+
-60,16}}, color={0,0,127}));
130130
connect(SPEED, Governor.SPEED) annotation (Line(points={{-120,60},{-94,60},{
131-
-94,6},{-60,6}}, color={0,0,127}));
131+
-94,6},{-60,6}}, color={0,0,127}));
132132
connect(PELEC, Governor.PELEC) annotation (Line(points={{-120,-60},{-88,-60},
133-
{-88,-16},{-60,-16}}, color={0,0,127}));
133+
{-88,-16},{-60,-16}}, color={0,0,127}));
134134
connect(Turbine.SPEED, SPEED)
135135
annotation (Line(points={{68,24},{68,60},{-120,60}}, color={0,0,127}));
136136
connect(Turbine.PMECH, PMECH)
@@ -147,7 +147,7 @@ equation
147147
extent={{-74,148},{76,52}},
148148
textColor={28,108,200},
149149
textString="WEHGOV
150-
"), Text(
150+
"), Text(
151151
extent={{-62,68},{-4,52}},
152152
textColor={28,108,200},
153153
textString="SPEED"),

‎OpenIPSL/Electrical/Controls/PSSE/TG/WPIDHY.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ model WPIDHY "Woodward PID Hydro (WPIDHY) Governor [PSSE-MODELS]"
4040
{-60,60}})));
4141
Modelica.Blocks.Interfaces.RealInput PELEC
4242
"Machine electrical power [pu]"
43-
annotation (Placement(transformation(origin={-120,-60}, extent={{-20,-20},
44-
{20,20}}), iconTransformation(extent={{-100,
43+
annotation (Placement(transformation(origin={-120,-60}, extent={{-20,-20},
44+
{20,20}}), iconTransformation(extent={{-100,
4545
-80},{-60,-40}})));
4646
Modelica.Blocks.Interfaces.RealOutput PMECH "Turbine mechanical power [pu]" annotation (
4747
Placement(transformation(origin = {110, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(extent = {{100, -10}, {120, 10}})));
@@ -180,14 +180,14 @@ equation
180180
annotation (
181181
Icon(graphics={Rectangle(lineColor = {28, 108, 200}, extent = {{-100, 100}, {100, -100}}),
182182
Text(lineColor = {28, 108, 200}, fillColor = {255, 255, 255},
183-
fillPattern = FillPattern.Solid, extent={{-56,60},
184-
{4,20}}, textString = "SPEED"),
183+
fillPattern = FillPattern.Solid, extent={{-56,60},
184+
{4,20}}, textString = "SPEED"),
185185
Text(lineColor = {28, 108, 200}, fillColor = {255, 255, 255},
186-
fillPattern = FillPattern.Solid, extent={{-56,-40},
187-
{4,-80}}, textString = "PELEC"),
186+
fillPattern = FillPattern.Solid, extent={{-56,-40},
187+
{4,-80}}, textString = "PELEC"),
188188
Text(lineColor = {28, 108, 200}, fillColor = {255, 255, 255},
189-
fillPattern = FillPattern.Solid, extent = {{30, 20}, {90, -20}}, textString = "PMECH"),
190-
Text(lineColor={4,7,200}, extent={{-94,172},{94,90}},
189+
fillPattern = FillPattern.Solid, extent = {{30, 20}, {90, -20}}, textString = "PMECH"),
190+
Text(lineColor={4,7,200}, extent={{-94,172},{94,90}},
191191
textString="WPIDHY")}),
192192
Documentation(info="<html>
193193
<p>The following documentation is adapted from <a href=\"modelica://OpenIPSL.UsersGuide.References\">[PSSE-Models], chapter 7.5</a>3:</p>

0 commit comments

Comments
 (0)