Skip to content

Commit bcc4c8b

Browse files
dietmarwdietmarw
committed
Fixes annotations and documentation.
1 parent 836da39 commit bcc4c8b

20 files changed

Lines changed: 65 additions & 101 deletions

File tree

‎OpenIPSL/Electrical/Controls/PSSE/COMP/IEEEVC.mo‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.COMP;
2-
model IEEEVC "Voltage Regulator Current Compensating Model"
2+
model IEEEVC "Voltage Regulator Current Compensating Model [PSSE-MODELS]"
33
import Modelica.ComplexMath.j;
44
import 'abs' =
55
Modelica.ComplexMath.abs;
@@ -22,13 +22,11 @@ equation
2222
I_T = Gen_terminal.ir + j*Gen_terminal.ii;
2323
connect(Gen_terminal,Bus) annotation (Line(points={{-70,70},{70,70}},
2424
color={0,0,255}));
25-
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
26-
{100,100}}), graphics={Rectangle(extent={{-100,100},{100,-100}},
25+
annotation (Icon(graphics={Rectangle(extent={{-100,100},{100,-100}},
2726
lineColor={28,108,200}), Text(
2827
extent={{-54,36},{68,-36}},
2928
textColor={28,108,200},
30-
textString="IEEEVC")}), Diagram(
31-
coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
29+
textString="IEEEVC")}),
3230
Documentation(info="<html>
3331
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
3432
<td><p>Reference</p></td>
@@ -44,9 +42,8 @@ equation
4442
</tr>
4543
<tr>
4644
<td><p>Contact</p></td>
47-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
45+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
4846
</tr>
4947
</table>
50-
</html>"),
51-
conversion(noneFromVersion=""));
48+
</html>"));
5249
end IEEEVC;

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.ES;
2-
model AC7B "IEEE 421.5 2016 AC7B Excitation System"
2+
model AC7B "AC7B Excitation System [IEEE2016]"
33
extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
44
import OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.invFEX;
55
import OpenIPSL.NonElectrical.Functions.SE;
@@ -281,8 +281,7 @@ equation
281281
connect(add3.y, pID_No_Windup.u) annotation (Line(points={{-72,81},{-72,111},{
282282
-60.6,111}}, color={0,0,127}));
283283
annotation (Diagram(coordinateSystem(extent={{-200,-200},{200,160}})),
284-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
285-
Text(
284+
Icon(graphics={ Text(
286285
extent={{-96,-60},{-26,-80}},
287286
lineColor={28,108,200},
288287
textString="
@@ -295,7 +294,7 @@ equation
295294
extent={{-74,140},{70,98}},
296295
textColor={28,108,200},
297296
textString="AC7B")}),
298-
Documentation(info="<html>
297+
Documentation(revisions="<html>
299298
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
300299
<td><p>Reference</p></td>
301300
<td><p>IEEE 421.5 2016 AC7B Excitation System (PSS/E Manual)</p></td>
@@ -310,9 +309,8 @@ equation
310309
</tr>
311310
<tr>
312311
<td><p>Contact</p></td>
313-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
312+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
314313
</tr>
315314
</table>
316-
</html>"),
317-
conversion(noneFromVersion=""));
315+
</html>"));
318316
end AC7B;

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.ES;
2-
model AC8B "IEEE 421.5 2005 AC8B Excitation System"
2+
model AC8B "AC8B Excitation System [IEEE2005]"
33
import OpenIPSL.NonElectrical.Functions.SE;
44
import OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.invFEX;
55
extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
@@ -194,7 +194,7 @@ equation
194194
extent={{-42,152},{36,82}},
195195
lineColor={28,108,200},
196196
textString="AC8B")}),
197-
Documentation(info="<html>
197+
Documentation(revisions="<html>
198198
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
199199
<td><p>Reference</p></td>
200200
<td><p>IEEE 421.5 2005 AC8B Excitation System (PSS/E Manual)</p></td>
@@ -209,9 +209,8 @@ equation
209209
</tr>
210210
<tr>
211211
<td><p>Contact</p></td>
212-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
212+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
213213
</tr>
214214
</table>
215-
</html>"),
216-
conversion(noneFromVersion=""));
215+
</html>"));
217216
end AC8B;

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.ES;
2-
model DC4B "IEEE 421.5 2005 DC4B Excitation System"
2+
model DC4B "DC4B Excitation System [IEEE2005]"
33
extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
44
import OpenIPSL.NonElectrical.Functions.SE;
55
import
@@ -185,18 +185,15 @@ equation
185185
124},{100,102},{66,102},{66,62},{74,62}}, color={0,0,127}));
186186
connect(simpleLagLimVar.y, rotatingExciterLimited.I_C) annotation (Line(
187187
points={{97,62},{102,62},{102,0},{112.5,0}}, color={0,0,127}));
188-
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
189-
{100,100}}), graphics={
190-
Text(
188+
annotation (Icon(graphics={Text(
191189
extent={{-112,-60},{-42,-80}},
192190
lineColor={28,108,200},
193191
textString="VT"), Text(
194192
extent={{-50,142},{44,96}},
195193
textColor={28,108,200},
196-
textString="DC4B")}), Diagram(
197-
coordinateSystem(preserveAspectRatio=false, extent={{-200,-200},{200,
198-
160}})),
199-
Documentation(info="<html>
194+
textString="DC4B")}),
195+
Diagram(coordinateSystem(extent={{-200,-200},{200,160}})),
196+
Documentation(revisions="<html>
200197
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
201198
<td><p>Reference</p></td>
202199
<td><p>IEEE 421.5 2005 DC4B Excitation System (PSS/E Manual)</p></td>
@@ -211,9 +208,8 @@ equation
211208
</tr>
212209
<tr>
213210
<td><p>Contact</p></td>
214-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
211+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
215212
</tr>
216213
</table>
217-
</html>"),
218-
conversion(noneFromVersion=""));
214+
</html>"));
219215
end DC4B;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
within OpenIPSL.Electrical.Controls.PSSE.ES;
22
model EXBAS
3-
"Basler Static Voltage Regulator Feeding DC or AC Rotating Exciter"
3+
"Basler Static Voltage Regulator Feeding DC or AC Rotating Exciter [PSSE-MODELS]"
44
extends OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.BaseExciter;
55
import OpenIPSL.Electrical.Controls.PSSE.ES.BaseClasses.invFEX;
66
import OpenIPSL.NonElectrical.Functions.SE;
@@ -176,7 +176,7 @@ equation
176176
extent={{-58,142},{76,98}},
177177
textColor={28,108,200},
178178
textString="EXBAS")}),
179-
Documentation(info="<html>
179+
Documentation(revisions="<html>
180180
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
181181
<td><p>Reference</p></td>
182182
<td><p>Basler Static Voltage Regulator Feeding dc or ac Rotating Exciter (PSS/E Manual)</p></td>
@@ -191,7 +191,7 @@ equation
191191
</tr>
192192
<tr>
193193
<td><p>Contact</p></td>
194-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
194+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
195195
</tr>
196196
</table>
197197
</html>"));

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,14 @@ equation
233233
0},{340,-120},{216,-120},{216,-98},{122,-98}}, color={0,0,127}));
234234
connect(PELEC, PE_Transducer.u)
235235
annotation (Line(points={{-200,-140},{-122,-140}}, color={0,0,127}));
236-
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
237-
-100},{100,100}}), graphics={Rectangle(extent={{-100,
236+
annotation (Icon(graphics={Rectangle(extent={{-100,
238237
-100},{100,100}},
239238
lineColor={28,108,200}), Text(
240239
extent={{-84,60},{88,-56}},
241240
textColor={28,108,200},
242241
textString="Governor")}),
243-
Diagram(coordinateSystem(preserveAspectRatio=false,
244-
extent={{-180,-180},{360,180}})),
245-
Documentation(info="<html>
242+
Diagram(coordinateSystem( extent={{-180,-180},{360,180}})),
243+
Documentation(revisions="<html>
246244
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
247245
<td><p>Reference</p></td>
248246
<td><p>WEHGOV governor and hydraulic actuators (PSS/E Manual)</p></td>
@@ -257,7 +255,7 @@ equation
257255
</tr>
258256
<tr>
259257
<td><p>Contact</p></td>
260-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
258+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
261259
</tr>
262260
</table>
263261
</html>"));

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,11 @@ equation
163163
annotation (Line(points={{41,-60},{78,-60}}, color={0,0,127}));
164164
connect(division.u1, Lookup_Flow_Pmech.u) annotation (Line(points={{-24,62},{-24,
165165
70},{60,70},{60,-60},{78,-60}}, color={0,0,127}));
166-
annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
167-
-100},{100,100}}), graphics={Rectangle(extent={{-100,100},{
168-
100,-100}},
166+
annotation (Icon(graphics={Rectangle(extent={{-100,100},{100,-100}},
169167
lineColor={28,108,200}), Text(
170168
extent={{-84,32},{90,-24}},
171169
textColor={28,108,200},
172-
textString="Turbine")}), Diagram(coordinateSystem(
173-
preserveAspectRatio=false, extent={{-100,-100},{200,100}})),
174-
Documentation(info="<html>
170+
textString="Turbine")}), Documentation(revisions="<html>
175171
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
176172
<td><p>Reference</p></td>
177173
<td><p>WEHGOV turbine dynamics (PSS/E Manual)</p></td>
@@ -186,7 +182,7 @@ equation
186182
</tr>
187183
<tr>
188184
<td><p>Contact</p></td>
189-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
185+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
190186
</tr>
191187
</table>
192188
</html>"));

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.TG;
2-
model IEEEG2 "IEEE Type 2 Speed-Governing Model"
2+
model IEEEG2 "IEEE Type 2 Speed-Governing Model [PSSE-MODELS]"
33
extends OpenIPSL.Electrical.Controls.PSSE.TG.BaseClasses.BaseGovernor;
44
parameter Real K=20 "Permanent governor gain K=1/R (pu on generator MVA base)";
55
parameter Types.Time T_1=50 "Compensator time constant (sec)";
@@ -48,12 +48,11 @@ equation
4848
-121},{-118.55,-121},{-99.4,-121}}, color={0,0,127}));
4949
connect(simpleLag.y, add.u2) annotation (Line(points={{-37.3,-121},{-37.3,-120},
5050
{-20,-120},{-20,-14},{-4.8,-14},{-4.8,-14.4}}, color={0,0,127}));
51-
annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={Text(
51+
annotation (Icon(graphics={Text(
5252
extent={{-88,48},{10,-50}},
5353
lineColor={28,108,200},
54-
textString="IEEEG2")}), Diagram(
55-
coordinateSystem(preserveAspectRatio=false)),
56-
Documentation(info="<html>
54+
textString="IEEEG2")}),
55+
Documentation(revisions="<html>
5756
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
5857
<td><p>Reference</p></td>
5958
<td><p>IEEE Type 2 Speed-Governing Model (PSS/E Manual)</p></td>
@@ -68,9 +67,8 @@ equation
6867
</tr>
6968
<tr>
7069
<td><p>Contact</p></td>
71-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
70+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
7271
</tr>
7372
</table>
74-
</html>"),
75-
conversion(noneFromVersion=""));
73+
</html>"));
7674
end IEEEG2;

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.TG;
2-
model WEHGOV "Woodward Electric Hydro Governor Model"
2+
model WEHGOV "Woodward Electric Hydro Governor Model [PSSE-MODELS]"
33
//Governor Parameters
44
parameter Types.ApparentPower S_b=100e6 "System base";
55
parameter Types.ApparentPower M_b=100e6 "System base";
@@ -62,8 +62,7 @@ model WEHGOV "Woodward Electric Hydro Governor Model"
6262
Pmech4=Pmech4,
6363
Pmech5=Pmech5,
6464
Pmech6=Pmech6,
65-
D_TURB=D_TURB)
66-
annotation (Placement(transformation(extent={{32,-20},{72,20}})));
65+
D_TURB=D_TURB) annotation (Placement(transformation(extent={{32,-20},{72,20}})));
6766

6867
BaseClasses.WEHGOV.Governor Governor(
6968
S_b=S_b,
@@ -101,8 +100,7 @@ model WEHGOV "Woodward Electric Hydro Governor Model"
101100
Pmech3=Pmech3,
102101
Pmech4=Pmech4,
103102
Pmech5=Pmech5,
104-
Pmech6=Pmech6)
105-
annotation (Placement(transformation(extent={{-56,-20},{-16,20}})));
103+
Pmech6=Pmech6) annotation (Placement(transformation(extent={{-56,-20},{-16,20}})));
106104

107105
Modelica.Blocks.Sources.Constant P_ref(k=Pref) annotation (Placement(transformation(origin={-78,30}, extent = {{-10, -10}, {10, 10}})));
108106
Modelica.Blocks.Interfaces.RealInput SPEED
@@ -143,7 +141,7 @@ equation
143141
connect(Governor.PMECH0, Turbine.PMECH0) annotation (Line(points={{-60,-6},{
144142
-68,-6},{-68,-24},{18,-24},{18,-16},{28,-16}},
145143
color={0,0,127}));
146-
annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
144+
annotation (Icon(graphics={
147145
Rectangle(extent={{-100,100},{100,-100}}, lineColor={28,108,200}),
148146
Text(
149147
extent={{-74,148},{76,52}},
@@ -160,9 +158,8 @@ equation
160158
Text(
161159
extent={{-64,-52},{-6,-68}},
162160
textColor={28,108,200},
163-
textString="PELEC")}), Diagram(
164-
coordinateSystem(preserveAspectRatio=false)),
165-
Documentation(info="<html>
161+
textString="PELEC")}),
162+
Documentation(revisions="<html>
166163
<table cellspacing=\"1\" cellpadding=\"1\" border=\"1\"><tr>
167164
<td><p>Reference</p></td>
168165
<td><p>Woodward Electric Hydro Governor Model (PSS/E Manual)</p></td>
@@ -177,7 +174,7 @@ equation
177174
</tr>
178175
<tr>
179176
<td><p>Contact</p></td>
180-
<td><p><a href=\"mailto:luigiv@kth.se\">luigiv@kth.se</a></p></td>
177+
<td><p>see <a href=\"modelica://OpenIPSL.UsersGuide.Contact\">UsersGuide.Contact</a></p></td>
181178
</tr>
182179
</table>
183180
</html>"));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within OpenIPSL.Electrical.Controls.PSSE.TG;
2-
model WPIDHY "Woodward PID Hydro (WPIDHY) Governor"
2+
model WPIDHY "Woodward PID Hydro (WPIDHY) Governor [PSSE-MODELS]"
33
extends OpenIPSL.Icons.VerifiedModel;
44
parameter Types.Time T_REG=1
55
"Input time constant of governor, sec";

0 commit comments

Comments
 (0)