Skip to content

Commit 7537958

Browse files
ceraolodietmarw
authored andcommitted
Shorter and clearer generator names
Prior to this commit, the instancece names of the generators were very long, and therefore were truncated in diagrams. The length was not sue to special clarity purposes; it seemd just the consequence of some automatic naming algorithm. This commit introduces shorter names, leaving for the generators names at least the same meaninfulness, but allowing them to be visible in diagrams without zooming.
1 parent 5caf357 commit 7537958

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

OpenIPSL/Examples/IEEE14/IEEE_14_Buses.mo

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -335,28 +335,28 @@ model IEEE_14_Buses "IEEE 14-bus 5-machine base test system"
335335
xT=0.20912) annotation (Placement(transformation(
336336
extent={{-14,-14},{14,14}},
337337
origin={64,-18})));
338-
IEEE14.Generation_Groups.GroupBus2 groupBus2_1(
338+
IEEE14.Generation_Groups.GroupBus2 gen2(
339339
V_b=69000,
340340
v_0=1.045,
341341
P_0=0.400000000000003*SysData.S_b,
342342
Q_0=0.948604*SysData.S_b,
343343
angle_0=-0.143192)
344344
annotation (Placement(transformation(extent={{-94,-160},{-74,-140}})));
345-
IEEE14.Generation_Groups.GroupBus3 groupBus3_1(
345+
IEEE14.Generation_Groups.GroupBus3 gen3(
346346
V_b=69000,
347347
v_0=1.01,
348348
P_0=0.000000000000001*SysData.S_b,
349349
Q_0=0.597359*SysData.S_b,
350350
angle_0=-0.3396376)
351351
annotation (Placement(transformation(extent={{10,-160},{30,-140}})));
352-
IEEE14.Generation_Groups.GroupBus6 groupBus6_1(
352+
IEEE14.Generation_Groups.GroupBus6 gen6(
353353
V_b=13800,
354354
v_0=1.07,
355355
P_0=0.000000000000039*SysData.S_b,
356356
angle_0=-0.37708,
357357
Q_0=0.444329*SysData.S_b)
358358
annotation (Placement(transformation(extent={{-96,-10},{-76,10}})));
359-
IEEE14.Generation_Groups.GroupBus8 groupBus8_1(
359+
IEEE14.Generation_Groups.GroupBus8 gen8(
360360
V_b=18000,
361361
v_0=1.09,
362362
P_0=-0.000000000000000*SysData.S_b,
@@ -385,7 +385,7 @@ model IEEE_14_Buses "IEEE 14-bus 5-machine base test system"
385385
extent={{-7,-7},{7,7}},
386386
rotation=270,
387387
origin={73,-51})));
388-
IEEE14.Generation_Groups.GroupBus1 groupBus1_1(
388+
IEEE14.Generation_Groups.GroupBus1 gen1(
389389
V_b=69000,
390390
v_0=1.06,
391391
angle_0=-0.00751491652,
@@ -490,11 +490,11 @@ equation
490490
-40},{-22,-40},{-22,-21.4},{-18,-21.4}}, color={0,0,255}));
491491
connect(B6.p, tWTransformerWithFixedTapRatio.n) annotation (Line(points={{-47,
492492
19},{-47,12},{-18,12},{-18,9.4}}, color={0,0,255}));
493-
connect(groupBus2_1.pwPin, B2.p) annotation (Line(points={{-73,-150},{-60,-150},
494-
{-60,-128}}, color={0,0,255}));
495-
connect(groupBus3_1.pwPin, B3.p) annotation (Line(points={{31,-150},{44,-150},
496-
{44,-122}}, color={0,0,255}));
497-
connect(groupBus6_1.pwPin, B6.p)
493+
connect(gen2.pwPin, B2.p) annotation (Line(points={{-73,-150},{-60,-150},{-60,
494+
-128}}, color={0,0,255}));
495+
connect(gen3.pwPin, B3.p)
496+
annotation (Line(points={{31,-150},{44,-150},{44,-122}}, color={0,0,255}));
497+
connect(gen6.pwPin, B6.p)
498498
annotation (Line(points={{-75,0},{-47,0},{-47,19}}, color={0,0,255}));
499499
connect(B4.p, tWTransformerWithFixedTapRatio2.p) annotation (Line(points={{32,
500500
-32},{36,-32},{36,-18},{48.6,-18}}, color={0,0,255}));
@@ -508,8 +508,8 @@ equation
508508
annotation (Line(points={{7,26},{16,26},{16,40}}, color={0,0,255}));
509509
connect(B5.p, L8.p) annotation (Line(points={{-24,-40},{-24,-40},{-14,-40},{-14,
510510
-53},{-7,-53}}, color={0,0,255}));
511-
connect(B8.p, groupBus8_1.pwPin) annotation (Line(points={{149,-37},{159.5,-37},
512-
{159.5,-36},{161,-36}}, color={0,0,255}));
511+
connect(B8.p, gen8.pwPin) annotation (Line(points={{149,-37},{159.5,-37},{
512+
159.5,-36},{161,-36}}, color={0,0,255}));
513513
connect(L15.p, B9.p)
514514
annotation (Line(points={{52,60.9},{86,60.9},{86,44}}, color={0,0,255}));
515515
connect(B9.p, L16.p) annotation (Line(points={{86,44},{86,44},{86,56},{96,56},
@@ -532,8 +532,8 @@ equation
532532
connect(L3.n, B2.p) annotation (Line(points={{-135,-105},{-135,-134},{-60,
533533
-134},{-60,-128}},
534534
color={0,0,255}));
535-
connect(groupBus1_1.pwPin, B1.p) annotation (Line(points={{-157,-6},{-135,-6},
536-
{-135,-31}}, color={0,0,255}));
535+
connect(gen1.pwPin, B1.p) annotation (Line(points={{-157,-6},{-135,-6},{-135,
536+
-31}}, color={0,0,255}));
537537
connect(B4.p, pwFault2.p) annotation (Line(points={{32,-32},{32,-28},{73,-28},
538538
{73,-42.8333}}, color={0,0,255}));
539539
annotation (

0 commit comments

Comments
 (0)