Skip to content

Commit 7b8312f

Browse files
ceraoloceraolo
authored
Expanded instance name text rectangle
Expanded the text rectangles of groups 1 to 6, so that the group names are visible for a much larger part. Indeed in case the instance name goes beyond the text rectangle both Dymola and OpenModelica use ellipsees, and show only part of the name. Therefore it is recommended to use rectancles for instance names spanning the entire witdth of the icon. Previously the rectangles had much more limited horizontal widths.
1 parent 99b18b1 commit 7b8312f

5 files changed

Lines changed: 398 additions & 398 deletions

File tree

‎OpenIPSL/Examples/IEEE14/Generation_Groups/GroupBus1.mo‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
within OpenIPSL.Examples.IEEE14.Generation_Groups;
2-
model GroupBus1 "69kV/615MVA generation unit connected to bus 1"
3-
extends OpenIPSL.Electrical.Essentials.pfComponent;
4-
parameter Real vf0=1.122656195484139 "Initial field voltage";
5-
parameter Real vref0=1.065622531687790 "Reference voltage AVR";
6-
OpenIPSL.Electrical.Controls.PSAT.AVR.AVRTypeII AVR1(
7-
Ta=0.02,
8-
Kf=0.002,
9-
Tf=1,
10-
Ke=1,
11-
Te=0.2,
12-
Tr=0.001,
13-
vrmax=7.32,
14-
vrmin=0,
15-
Ka=200,
16-
v0=v_0) annotation (Placement(transformation(extent={{-8,0},{12,20}})));
17-
OpenIPSL.Electrical.Machines.PSAT.Order5_Type2 Syn1(
18-
Sn=615000000,
19-
Vn=69000,
20-
V_b=V_b,
21-
fn=60,
22-
ra=0,
23-
xd=0.8979,
24-
xq=0.646,
25-
x1d=0.2998,
26-
x2d=0.23,
27-
x2q=0.4,
28-
T1d0=7.4,
29-
T2d0=0.03,
30-
T2q0=0.033,
31-
M=2*5.148,
32-
D=2,
33-
v_0=v_0,
34-
angle_0=angle_0,
35-
P_0=P_0,
36-
Q_0=Q_0) annotation (Placement(transformation(extent={{40,-20},{80,20}})));
37-
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
38-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
39-
equation
40-
connect(AVR1.vf, Syn1.vf) annotation (Line(points={{14,10},{36,10}},
41-
color={0,0,127}));
42-
connect(Syn1.v, AVR1.v) annotation (Line(points={{82,6},{88,6},{88,-30},{-16,-30},
43-
{-16,4},{-10,4}}, color={0,0,127}));
44-
connect(Syn1.p, pwPin) annotation (Line(points={{80,0},{110,0}},
45-
color={0,0,255}));
46-
connect(Syn1.pm0, Syn1.pm) annotation (Line(points={{44,-22},{44,-26},{28,-26},
47-
{28,-10},{36,-10}}, color={0,0,127}));
48-
connect(AVR1.vref0, AVR1.vref) annotation (Line(points={{2,22},{2,26},{-16,26},
49-
{-16,16},{-10,16}}, color={0,0,127}));
50-
connect(AVR1.vf0, Syn1.vf0) annotation (Line(points={{2,-2},{2,-12},{20,-12},{
51-
20,26},{44,26},{44,22}}, color={0,0,127}));
52-
annotation (
53-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
54-
false),graphics={Text(
55-
extent={{-93,6},{-24,-12}},
56-
lineColor={0,0,255},
57-
textStyle={TextStyle.Italic},
58-
textString=""),
59-
Text(extent={{-34,-32},{38,-52}},
60-
lineColor={28,108,200},
61-
fillColor={0,0,255},
62-
fillPattern=FillPattern.Solid,
63-
textString="%name"),
64-
Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
65-
color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
66-
{28,108,200})}),
67-
Documentation(info="<html>
68-
<p>69kV/615MVA Generation unit connected to bus 1, and composed of the following component models:</p>
69-
<ul>
70-
<li><strong>Machine</strong>: 5th order type 2, from PSAT.</li>
71-
<li><strong>Exciter</strong>: type II, from PSAT.</li>
72-
</ul>
73-
</html>"));
74-
end GroupBus1;
1+
within OpenIPSL.Examples.IEEE14.Generation_Groups;
2+
model GroupBus1 "69kV/615MVA generation unit connected to bus 1"
3+
extends OpenIPSL.Electrical.Essentials.pfComponent;
4+
parameter Real vf0=1.122656195484139 "Initial field voltage";
5+
parameter Real vref0=1.065622531687790 "Reference voltage AVR";
6+
OpenIPSL.Electrical.Controls.PSAT.AVR.AVRTypeII AVR1(
7+
Ta=0.02,
8+
Kf=0.002,
9+
Tf=1,
10+
Ke=1,
11+
Te=0.2,
12+
Tr=0.001,
13+
vrmax=7.32,
14+
vrmin=0,
15+
Ka=200,
16+
v0=v_0) annotation (Placement(transformation(extent={{-8,0},{12,20}})));
17+
OpenIPSL.Electrical.Machines.PSAT.Order5_Type2 Syn1(
18+
Sn=615000000,
19+
Vn=69000,
20+
V_b=V_b,
21+
fn=60,
22+
ra=0,
23+
xd=0.8979,
24+
xq=0.646,
25+
x1d=0.2998,
26+
x2d=0.23,
27+
x2q=0.4,
28+
T1d0=7.4,
29+
T2d0=0.03,
30+
T2q0=0.033,
31+
M=2*5.148,
32+
D=2,
33+
v_0=v_0,
34+
angle_0=angle_0,
35+
P_0=P_0,
36+
Q_0=Q_0) annotation (Placement(transformation(extent={{40,-20},{80,20}})));
37+
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
38+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
39+
equation
40+
connect(AVR1.vf, Syn1.vf) annotation (Line(points={{14,10},{36,10}},
41+
color={0,0,127}));
42+
connect(Syn1.v, AVR1.v) annotation (Line(points={{82,6},{88,6},{88,-30},{-16,-30},
43+
{-16,4},{-10,4}}, color={0,0,127}));
44+
connect(Syn1.p, pwPin) annotation (Line(points={{80,0},{110,0}},
45+
color={0,0,255}));
46+
connect(Syn1.pm0, Syn1.pm) annotation (Line(points={{44,-22},{44,-26},{28,-26},
47+
{28,-10},{36,-10}}, color={0,0,127}));
48+
connect(AVR1.vref0, AVR1.vref) annotation (Line(points={{2,22},{2,26},{-16,26},
49+
{-16,16},{-10,16}}, color={0,0,127}));
50+
connect(AVR1.vf0, Syn1.vf0) annotation (Line(points={{2,-2},{2,-12},{20,-12},{
51+
20,26},{44,26},{44,22}}, color={0,0,127}));
52+
annotation (
53+
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
54+
false),graphics={Text(
55+
extent={{-93,6},{-24,-12}},
56+
lineColor={0,0,255},
57+
textStyle={TextStyle.Italic},
58+
textString=""),
59+
Text(extent={{-100,-34},{100,-50}},
60+
lineColor={28,108,200},
61+
fillColor={0,0,255},
62+
fillPattern=FillPattern.Solid,
63+
textString="%name"),
64+
Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
65+
color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
66+
{28,108,200})}),
67+
Documentation(info="<html>
68+
<p>69kV/615MVA Generation unit connected to bus 1, and composed of the following component models:</p>
69+
<ul>
70+
<li><strong>Machine</strong>: 5th order type 2, from PSAT.</li>
71+
<li><strong>Exciter</strong>: type II, from PSAT.</li>
72+
</ul>
73+
</html>"));
74+
end GroupBus1;

‎OpenIPSL/Examples/IEEE14/Generation_Groups/GroupBus2.mo‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
within OpenIPSL.Examples.IEEE14.Generation_Groups;
2-
model GroupBus2 "69kV/60MVA generation unit connected to bus 2"
3-
extends OpenIPSL.Electrical.Essentials.pfComponent;
4-
parameter Real vf0=2.718126892405429 "Initial field voltage";
5-
parameter Real vref0=1.181847826013889 "Reference voltage AVR";
6-
OpenIPSL.Electrical.Controls.PSAT.AVR.AVRTypeII aVR1TypeII1(
7-
Ta=0.02,
8-
Tf=1,
9-
Ke=1,
10-
Tr=0.001,
11-
Ka=20,
12-
Kf=0.001,
13-
Te=1.98,
14-
v0=v_0,
15-
vrmin=0,
16-
vrmax=4.38)
17-
annotation (Placement(transformation(extent={{-6,0},{14,20}})));
18-
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn3(
19-
Sn=60000000,
20-
Vn=69000,
21-
V_b=V_b,
22-
fn=60,
23-
ra=0.0031,
24-
xq=0.98,
25-
x1d=0.1850,
26-
x1q=0.36,
27-
x2d=0.13,
28-
x2q=0.13,
29-
T1d0=6.1,
30-
T1q0=0.3,
31-
T2q0=0.099,
32-
M=2*6.54,
33-
D=2,
34-
v_0=v_0,
35-
xd=1.05,
36-
angle_0=angle_0,
37-
P_0=P_0,
38-
Q_0=Q_0) annotation (Placement(transformation(extent={{42,-20},{82,20}})));
39-
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
40-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
41-
equation
42-
connect(aVR1TypeII1.vf, Syn3.vf) annotation (Line(points={{16,10},{38,10}},
43-
color={0,0,127}));
44-
connect(Syn3.v, aVR1TypeII1.v) annotation (Line(points={{84,6},{90,6},{90,-32},
45-
{-14,-32},{-14,4},{-8,4}}, color={
46-
0,0,127}));
47-
connect(Syn3.p, pwPin) annotation (Line(points={{82,0},{110,0}},
48-
color={0,0,255}));
49-
connect(Syn3.pm0, Syn3.pm) annotation (Line(points={{46,-22},{46,-28},{28,-28},
50-
{28,-10},{38,-10}}, color={0,0,127}));
51-
connect(Syn3.vf0, aVR1TypeII1.vf0) annotation (Line(points={{46,22},{46,28},{
52-
24,28},{24,-28},{4,-28},{4,-2}}, color={0,0,127}));
53-
connect(aVR1TypeII1.vref0, aVR1TypeII1.vref) annotation (Line(points={{4,22},{
54-
4,28},{-14,28},{-14,16},{-8,16}}, color={0,0,
55-
127}));
56-
annotation (
57-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,-100},{
58-
120,100}})),
59-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
60-
false), graphics={
61-
Text(extent={{-34,-32},{38,-52}},
62-
lineColor={28,108,200},
63-
fillColor={0,0,255},
64-
fillPattern=FillPattern.Solid,
65-
textString="%name"),
66-
Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
67-
color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
68-
{28,108,200})}),
69-
Documentation(info="<html>
70-
<p>69kV/60MVA Generation unit connected to bus 2, and composed of the following component models:</p>
71-
<ul>
72-
<li><strong>Machine</strong>: 6th order, from PSAT.</li>
73-
<li><strong>Exciter</strong>: type II, from PSAT.</li>
74-
</ul>
75-
</html>"));
76-
end GroupBus2;
1+
within OpenIPSL.Examples.IEEE14.Generation_Groups;
2+
model GroupBus2 "69kV/60MVA generation unit connected to bus 2"
3+
extends OpenIPSL.Electrical.Essentials.pfComponent;
4+
parameter Real vf0=2.718126892405429 "Initial field voltage";
5+
parameter Real vref0=1.181847826013889 "Reference voltage AVR";
6+
OpenIPSL.Electrical.Controls.PSAT.AVR.AVRTypeII aVR1TypeII1(
7+
Ta=0.02,
8+
Tf=1,
9+
Ke=1,
10+
Tr=0.001,
11+
Ka=20,
12+
Kf=0.001,
13+
Te=1.98,
14+
v0=v_0,
15+
vrmin=0,
16+
vrmax=4.38)
17+
annotation (Placement(transformation(extent={{-6,0},{14,20}})));
18+
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn3(
19+
Sn=60000000,
20+
Vn=69000,
21+
V_b=V_b,
22+
fn=60,
23+
ra=0.0031,
24+
xq=0.98,
25+
x1d=0.1850,
26+
x1q=0.36,
27+
x2d=0.13,
28+
x2q=0.13,
29+
T1d0=6.1,
30+
T1q0=0.3,
31+
T2q0=0.099,
32+
M=2*6.54,
33+
D=2,
34+
v_0=v_0,
35+
xd=1.05,
36+
angle_0=angle_0,
37+
P_0=P_0,
38+
Q_0=Q_0) annotation (Placement(transformation(extent={{42,-20},{82,20}})));
39+
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
40+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
41+
equation
42+
connect(aVR1TypeII1.vf, Syn3.vf) annotation (Line(points={{16,10},{38,10}},
43+
color={0,0,127}));
44+
connect(Syn3.v, aVR1TypeII1.v) annotation (Line(points={{84,6},{90,6},{90,-32},
45+
{-14,-32},{-14,4},{-8,4}}, color={
46+
0,0,127}));
47+
connect(Syn3.p, pwPin) annotation (Line(points={{82,0},{110,0}},
48+
color={0,0,255}));
49+
connect(Syn3.pm0, Syn3.pm) annotation (Line(points={{46,-22},{46,-28},{28,-28},
50+
{28,-10},{38,-10}}, color={0,0,127}));
51+
connect(Syn3.vf0, aVR1TypeII1.vf0) annotation (Line(points={{46,22},{46,28},{
52+
24,28},{24,-28},{4,-28},{4,-2}}, color={0,0,127}));
53+
connect(aVR1TypeII1.vref0, aVR1TypeII1.vref) annotation (Line(points={{4,22},{
54+
4,28},{-14,28},{-14,16},{-8,16}}, color={0,0,
55+
127}));
56+
annotation (
57+
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,-100},{
58+
120,100}})),
59+
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
60+
false), graphics={
61+
Text(extent={{-100,-34},{100,-50}},
62+
lineColor={28,108,200},
63+
fillColor={0,0,255},
64+
fillPattern=FillPattern.Solid,
65+
textString="%name"),
66+
Line(points={{-60,-20},{-20,20},{20,-20},{60,20}},
67+
color={28,108,200}),Ellipse(extent={{-100,-100},{100,100}}, lineColor=
68+
{28,108,200})}),
69+
Documentation(info="<html>
70+
<p>69kV/60MVA Generation unit connected to bus 2, and composed of the following component models:</p>
71+
<ul>
72+
<li><strong>Machine</strong>: 6th order, from PSAT.</li>
73+
<li><strong>Exciter</strong>: type II, from PSAT.</li>
74+
</ul>
75+
</html>"));
76+
end GroupBus2;

0 commit comments

Comments
 (0)