Skip to content

Commit dc40a77

Browse files
dietmarwdietmarw
committed
Fix the diagrams and icons
Please don't use custom diagram sizes if not REALLY necessary.
1 parent c7b6cda commit dc40a77

5 files changed

Lines changed: 85 additions & 95 deletions

File tree

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ model GroupBus1 "69kV/615MVA generation unit connected to bus 1"
1313
vrmax=7.32,
1414
vrmin=0,
1515
Ka=200,
16-
v0=v_0) annotation (Placement(transformation(extent={{-8,0},{12,20}})));
16+
v0=v_0) annotation (Placement(transformation(extent={{-10,0},{10,20}})));
1717
OpenIPSL.Electrical.Machines.PSAT.Order5_Type2 Syn1(
1818
Sn=615000000,
1919
Vn=69000,
@@ -35,36 +35,35 @@ model GroupBus1 "69kV/615MVA generation unit connected to bus 1"
3535
P_0=P_0,
3636
Q_0=Q_0) annotation (Placement(transformation(extent={{40,-20},{80,20}})));
3737
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
38-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
38+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
3939
equation
40-
connect(AVR1.vf, Syn1.vf) annotation (Line(points={{14,10},{36,10}},
40+
connect(AVR1.vf, Syn1.vf) annotation (Line(points={{12,10},{36,10}},
4141
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}));
42+
connect(Syn1.v, AVR1.v) annotation (Line(points={{82,6},{90,6},{90,-32},{-20,-32},{-20,4},{-12,4}},
43+
color={0,0,127}));
4444
connect(Syn1.p, pwPin) annotation (Line(points={{80,0},{110,0}},
4545
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}));
46+
connect(Syn1.pm0, Syn1.pm) annotation (Line(points={{44,-22},{44,-28},{28,-28},{28,-10},{36,-10}},
47+
color={0,0,127}));
48+
connect(AVR1.vref0, AVR1.vref) annotation (Line(points={{0,22},{0,30},{-20,30},{-20,16},{-12,16}},
49+
color={0,0,127}));
50+
connect(AVR1.vf0, Syn1.vf0) annotation (Line(points={{0,-2},{0,-12},{20,-12},{20,30},{44,30},{44,22}},
51+
color={0,0,127}));
5252
annotation (
53-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
54-
false),graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
55-
Text(origin={-7.1542,-4.28575},
56-
lineColor = {28, 108, 200}, fillColor = {0, 0, 255},
57-
fillPattern = FillPattern.Solid,
58-
extent={{
59-
-85.8458,-19.7143},{95.1542,-31.7143}},textString = "%name"),
53+
Icon(graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
54+
Text(
55+
lineColor={28,108,200},
56+
fillColor={0,0,255},
57+
fillPattern=FillPattern.Solid,
58+
extent={{-100,-20},{100,-40}},
59+
textString="%name"),
6060
Line(points={{-60,0},{-20,40},{20,0},{60,40}},
61-
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100, -100},{100,100}})}),
61+
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100,-100},{100,100}})}),
6262
Documentation(info="<html>
6363
<p>69kV/615MVA Generation unit connected to bus 1, and composed of the following component models:</p>
6464
<ul>
6565
<li><strong>Machine</strong>: 5th order type 2, from PSAT.</li>
6666
<li><strong>Exciter</strong>: type II, from PSAT.</li>
6767
</ul>
68-
</html>"),
69-
Diagram(coordinateSystem(extent = {{-20, 40}, {120, -40}})));
68+
</html>"));
7069
end GroupBus1;

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ model GroupBus2 "69kV/60MVA generation unit connected to bus 2"
1414
v0=v_0,
1515
vrmin=0,
1616
vrmax=4.38)
17-
annotation (Placement(transformation(extent={{-6,0},{14,20}})));
17+
annotation (Placement(transformation(extent={{-10,0},{10,20}})));
1818
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn3(
1919
Sn=60000000,
2020
Vn=69000,
@@ -35,30 +35,26 @@ model GroupBus2 "69kV/60MVA generation unit connected to bus 2"
3535
xd=1.05,
3636
angle_0=angle_0,
3737
P_0=P_0,
38-
Q_0=Q_0) annotation (Placement(transformation(extent={{42,-20},{82,20}})));
38+
Q_0=Q_0) annotation (Placement(transformation(extent={{40,-20},{80,20}})));
3939
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
40-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
40+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
4141
equation
42-
connect(aVR1TypeII1.vf, Syn3.vf) annotation (Line(points={{16,10},{38,10}},
42+
connect(aVR1TypeII1.vf, Syn3.vf) annotation (Line(points={{12,10},{36,10}},
4343
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={
44+
connect(Syn3.v, aVR1TypeII1.v) annotation (Line(points={{82,6},{90,6},{90,-32},{-20,-32},{-20,4},{-12,4}},
45+
color={
4646
0,0,127}));
47-
connect(Syn3.p, pwPin) annotation (Line(points={{82,0},{110,0}},
47+
connect(Syn3.p, pwPin) annotation (Line(points={{80,0},{110,0}},
4848
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,
49+
connect(Syn3.pm0, Syn3.pm) annotation (Line(points={{44,-22},{44,-28},{28,-28},{28,-10},{36,-10}},
50+
color={0,0,127}));
51+
connect(Syn3.vf0, aVR1TypeII1.vf0) annotation (Line(points={{44,22},{44,30},{20,30},{20,-12},{0,-12},{0,-2}},
52+
color={0,0,127}));
53+
connect(aVR1TypeII1.vref0, aVR1TypeII1.vref) annotation (Line(points={{0,22},{0,30},{-20,30},{-20,16},{-12,16}},
54+
color={0,0,
5555
127}));
5656
annotation (
57-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-20,-40},{120,
58-
40}})),
59-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
60-
false), graphics={
61-
Text(extent={{-98,-20},{100,-38}},
57+
Icon(graphics={Text(extent={{-100,-20},{100,-40}},
6258
lineColor={28,108,200},
6359
fillColor={0,0,255},
6460
fillPattern=FillPattern.Solid,

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

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ model GroupBus3 "69kV/60MVA reactive power generation unit (synchronous condense
1515
vrmin=0,
1616
vrmax=4.38) annotation (Placement(transformation(
1717
extent={{-10,-10},{10,10}},
18-
origin={4,10})));
18+
origin={0,10})));
1919
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn2(
2020
Sn=60000000,
2121
Vn=69000,
@@ -38,35 +38,32 @@ model GroupBus3 "69kV/60MVA reactive power generation unit (synchronous condense
3838
P_0=P_0,
3939
Q_0=Q_0) annotation (Placement(transformation(
4040
extent={{-20,-20},{20,20}},
41-
origin={62,0})));
41+
origin={60,0})));
4242
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
43-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
43+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
4444
equation
45-
connect(aVR2TypeII2.vf, Syn2.vf) annotation (Line(points={{16,10},{38,10}},
45+
connect(aVR2TypeII2.vf, Syn2.vf) annotation (Line(points={{12,10},{36,10}},
4646
color={0,0,127}));
47-
connect(Syn2.v, aVR2TypeII2.v) annotation (Line(points={{84,6},{90,6},{90,-30},
48-
{-14,-30},{-14,4},{-8,4}}, color={0,0,127}));
49-
connect(Syn2.p, pwPin) annotation (Line(points={{82,0},{110,0}},
47+
connect(Syn2.v, aVR2TypeII2.v) annotation (Line(points={{82,6},{90,6},{90,-32},{-20,-32},{-20,4},{-12,4}},
48+
color={0,0,127}));
49+
connect(Syn2.p, pwPin) annotation (Line(points={{80,0},{110,0}},
5050
color={0,0,255}));
51-
connect(Syn2.pm0, Syn2.pm) annotation (Line(points={{46,-22},{46,-26},{30,-26},
52-
{30,-10},{38,-10}}, color={0,0,127}));
53-
connect(aVR2TypeII2.vref0, aVR2TypeII2.vref) annotation (Line(points={{4,22},{
54-
4,28},{-14,28},{-14,16},{-8,16}}, color={0,0,
51+
connect(Syn2.pm0, Syn2.pm) annotation (Line(points={{44,-22},{44,-28},{28,-28},{28,-10},{36,-10}},
52+
color={0,0,127}));
53+
connect(aVR2TypeII2.vref0, aVR2TypeII2.vref) annotation (Line(points={{0,22},{0,30},{-20,30},{-20,16},{-12,16}},
54+
color={0,0,
5555
127}));
56-
connect(Syn2.vf0, aVR2TypeII2.vf0) annotation (Line(points={{46,22},{46,28},{
57-
26,28},{26,-26},{4,-26},{4,-2}}, color={0,0,
56+
connect(Syn2.vf0, aVR2TypeII2.vf0) annotation (Line(points={{44,22},{44,30},{20,30},{20,-12},{0,-12},{0,-2}},
57+
color={0,0,
5858
127}));
5959
annotation (
60-
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-20,-40},{120,
61-
40}})),
62-
Icon(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=
63-
false), graphics={
64-
Text(
60+
Icon(graphics={ Text(
6561
extent={{-93,6},{-24,-12}},
6662
lineColor={0,0,255},
6763
textStyle={TextStyle.Italic},
6864
textString=""),
69-
Text(extent={{-96,-20},{96,-38}},
65+
Text(
66+
extent={{-100,-20},{100,-40}},
7067
lineColor={28,108,200},
7168
fillColor={0,0,255},
7269
fillPattern=FillPattern.Solid,

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ model GroupBus6 "13.8kV/25MVA reactive power generation unit (synchronous conden
1515
vrmin=1.395,
1616
vrmax=6.81) annotation (Placement(transformation(
1717
extent={{-10,-10},{10,10}},
18-
origin={2,10})));
18+
origin={0,10})));
1919
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn5(
2020
fn=60,
2121
D=2,
@@ -43,34 +43,33 @@ model GroupBus6 "13.8kV/25MVA reactive power generation unit (synchronous conden
4343
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={
4444
{100,-10},{120,10}}),iconTransformation(extent={{100,-10},{120,10}})));
4545
equation
46-
connect(aVR4TypeII1.vf, Syn5.vf) annotation (Line(points={{14,10},{36,10}},
46+
connect(aVR4TypeII1.vf, Syn5.vf) annotation (Line(points={{12,10},{36,10}},
4747
color={0,0,127}));
48-
connect(Syn5.v, aVR4TypeII1.v) annotation (Line(points={{82,6},{88,6},{88,32},
49-
{-22,32},{-22,4},{-10,4}}, color={0,0,127}));
48+
connect(Syn5.v, aVR4TypeII1.v) annotation (Line(points={{82,6},{90,6},{90,40},{-30,40},{-30,4},{-12,4}},
49+
color={0,0,127}));
5050
connect(Syn5.p, pwPin) annotation (Line(points={{80,0},{110,0}},
5151
color={0,0,255}));
52-
connect(Syn5.pm0, Syn5.pm) annotation (Line(points={{44,-22},{44,-26},{28,-26},
53-
{28,-10},{36,-10}}, color={0,0,127}));
54-
connect(aVR4TypeII1.vref0, aVR4TypeII1.vref) annotation (Line(points={{2,22},{
55-
2,28},{-16,28},{-16,16},{-10,16}}, color={0,0,127}));
56-
connect(Syn5.vf0, aVR4TypeII1.vf0) annotation (Line(points={{44,22},{44,28},{
57-
22,28},{22,-26},{2,-26},{2,-2}},
52+
connect(Syn5.pm0, Syn5.pm) annotation (Line(points={{44,-22},{44,-28},{28,-28},{28,-10},{36,-10}},
53+
color={0,0,127}));
54+
connect(aVR4TypeII1.vref0, aVR4TypeII1.vref) annotation (Line(points={{0,22},{0,30},{-20,30},{-20,16},{-12,16}},
55+
color={0,0,127}));
56+
connect(Syn5.vf0, aVR4TypeII1.vf0) annotation (Line(points={{44,22},{44,30},{20,30},{20,-12},{0,-12},{0,-2}},
5857
color={0,0,127}));
5958
annotation (
60-
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
61-
100}}), graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
62-
Text(origin={-5.31798,1}, lineColor = {28, 108, 200}, fillColor = {0, 0, 255},
63-
fillPattern = FillPattern.Solid, extent={{
64-
-85.682,-23},{97.318,-37}}, textString = "%name"),
59+
Icon(graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
60+
Text(
61+
lineColor={28,108,200},
62+
fillColor={0,0,255},
63+
fillPattern=FillPattern.Solid,
64+
extent={{-100,-20},{100,-40}},
65+
textString="%name"),
6566
Line(points={{-60,0},{-20,40},{20,0},{60,40}},
66-
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100,
67-
-100},{100,100}})}),
67+
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100,-100},{100,100}})}),
6868
Documentation(info="<html>
6969
<p>13.8kV/25MVA Reactive power generation unit (synchronous condenser) connected to bus 6, and composed of the following component models:</p>
7070
<ul>
7171
<li><strong>Machine</strong>: 6th order, from PSAT.</li>
7272
<li><strong>Exciter</strong>: type II, from PSAT.</li>
7373
</ul>
74-
</html>"),
75-
Diagram(coordinateSystem(extent = {{-20, 40}, {120, -40}})));
74+
</html>"));
7675
end GroupBus6;

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ model GroupBus8 "18kV/25MVA reactive power generation unit (synchronous condense
1313
Te=0.7,
1414
v0=v_0,
1515
vrmin=1.395,
16-
vrmax=6.810) annotation (Placement(visible = true, transformation(origin = {-2, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
16+
vrmax=6.810) annotation (Placement(visible = true, transformation(origin={0,10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
1717
OpenIPSL.Electrical.Machines.PSAT.Order6 Syn4(
1818
fn=60,
1919
D=2,
@@ -39,36 +39,35 @@ model GroupBus8 "18kV/25MVA reactive power generation unit (synchronous condense
3939
extent={{-20,-20},{20,20}},
4040
origin={60,0})));
4141
OpenIPSL.Interfaces.PwPin pwPin annotation (Placement(transformation(extent={{100,-10},
42-
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
42+
{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
4343
equation
4444
connect(aVR3TypeII2.vf, Syn4.vf) annotation (
45-
Line(points = {{10, 10}, {36, 10}}, color = {0, 0, 127}));
45+
Line(points={{12,10},{36,10}}, color = {0, 0, 127}));
4646
connect(Syn4.v, aVR3TypeII2.v) annotation (
47-
Line(points = {{82, 6}, {88, 6}, {88, -30}, {-18, -30}, {-18, 4}, {-14, 4}}, color = {0, 0, 127}));
47+
Line(points={{82,6},{90,6},{90,-32},{-20,-32},{-20,4},{-12,4}}, color = {0, 0, 127}));
4848
connect(Syn4.p, pwPin) annotation (Line(points={{80,0},{110,0}},
4949
color={0,0,255}));
50-
connect(Syn4.pm0, Syn4.pm) annotation (Line(points={{44,-22},{44,-26},{18,-26},
51-
{18,-10},{36,-10}}, color={0,0,127}));
50+
connect(Syn4.pm0, Syn4.pm) annotation (Line(points={{44,-22},{44,-28},{28,-28},{28,-10},{36,-10}},
51+
color={0,0,127}));
5252
connect(Syn4.vf0, aVR3TypeII2.vf0) annotation (
53-
Line(points = {{44, 22}, {44, 28}, {14, 28}, {14, -26}, {-2, -26}, {-2, -2}}, color = {0, 0, 127}));
53+
Line(points={{44,22},{44,30},{20,30},{20,-12},{0,-12},{0,-2}}, color = {0, 0, 127}));
5454
connect(aVR3TypeII2.vref0, aVR3TypeII2.vref) annotation (
55-
Line(points = {{-2, 22}, {-2, 28}, {-18, 28}, {-18, 16}, {-14, 16}}, color = {0, 0, 127}));
55+
Line(points={{0,22},{0,30},{-20,30},{-20,16},{-12,16}}, color = {0, 0, 127}));
5656
annotation (
57-
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
58-
100}}), graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
59-
Text(origin={-4.26002,12},
60-
lineColor = {28, 108, 200}, fillColor = {0, 0, 255},
61-
fillPattern = FillPattern.Solid, extent={{
62-
-86.74,-32},{96.26,-52}}, textString = "%name"),
57+
Icon(graphics={Text(lineColor = {0, 0, 255}, extent = {{-93, 6}, {-24, -12}}, textString = "", textStyle = {TextStyle.Italic}),
58+
Text(
59+
lineColor={28,108,200},
60+
fillColor={0,0,255},
61+
fillPattern=FillPattern.Solid,
62+
extent={{-100,-20},{100,-40}},
63+
textString="%name"),
6364
Line(points={{-60,0},{-20,40},{20,0},{60,40}},
64-
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100,
65-
-100},{100,100}})}),
65+
color={28,108,200}),Ellipse(lineColor = {28, 108, 200}, extent={{-100,-100},{100,100}})}),
6666
Documentation(info="<html>
6767
<p>18kV/25MVA Reactive power generation unit (synchronous condenser) connected to bus 8, and composed of the following component models:</p>
6868
<ul>
6969
<li><strong>Machine</strong>: 6th order, from PSAT.</li>
7070
<li><strong>Exciter</strong>: type II, from PSAT.</li>
7171
</ul>
72-
</html>"),
73-
Diagram(coordinateSystem(extent = {{-20, 40}, {120, -40}})));
72+
</html>"));
7473
end GroupBus8;

0 commit comments

Comments
 (0)