Skip to content

Commit cddc373

Browse files
dietmarwdietmarw
committed
Fix and clean up icon and diagram layer.
1 parent 21c6e06 commit cddc373

4 files changed

Lines changed: 12 additions & 20 deletions

File tree

‎OpenIPSL/Tests/BaseClasses/SMIBAddOn.mo‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,15 @@ partial model SMIBAddOn
3434
annotation (Placement(transformation(extent={{60,-10},{80,10}})));
3535
Electrical.Sources.VoltageSourceReImInput voltageSourceReImInput
3636
annotation (Placement(transformation(extent={{96,-10},{76,10}})));
37-
Modelica.Blocks.Sources.RealExpression realExpression
38-
annotation (Placement(transformation(extent={{130,-14},{110,6}})));
39-
Modelica.Blocks.Sources.RealExpression realExpression1(y=if time <= 50000
40-
then 1 else 0.99)
41-
annotation (Placement(transformation(extent={{130,10},{110,30}})));
37+
Modelica.Blocks.Sources.RealExpression imagPart annotation (Placement(transformation(extent={{80,-30},{100,-10}})));
38+
Modelica.Blocks.Sources.RealExpression realPart(y=if time <= 50000 then 1 else 0.99) annotation (Placement(transformation(extent={{80,10},{100,30}})));
4239
equation
4340
connect(FAULT.p,pwLine. p)
4441
annotation (Line(points={{28,0},{36,0},{36,6},{41,6}}, color={0,0,255}));
4542
connect(pwLine1.p,pwLine. p) annotation (Line(points={{41,-6},{36,-6},{36,6},
4643
{41,6}}, color={0,0,255}));
47-
connect(pwFault.p,FAULT. p) annotation (Line(points={{40.6667,-28},{32,-28},{
48-
32,0},{28,0}}, color={0,0,255}));
44+
connect(pwFault.p,FAULT. p) annotation (Line(points={{40.6667,-28},{32,-28},{32,0},{28,0}},
45+
color={0,0,255}));
4946
connect(pwLine.n,GEN2. p)
5047
annotation (Line(points={{59,6},{64,6},{64,0},{70,0}}, color={0,0,255}));
5148
connect(pwLine1.n,GEN2. p) annotation (Line(points={{59,-6},{64,-6},{64,0},{
@@ -56,9 +53,6 @@ equation
5653
annotation (Line(points={{0,0},{5,0}}, color={0,0,255}));
5754
connect(voltageSourceReImInput.p, GEN2.p)
5855
annotation (Line(points={{75,0},{70,0}}, color={0,0,255}));
59-
connect(voltageSourceReImInput.vIm, realExpression.y)
60-
annotation (Line(points={{98,-4},{109,-4}}, color={0,0,127}));
61-
connect(realExpression1.y, voltageSourceReImInput.vRe) annotation (Line(
62-
points={{109,20},{104,20},{104,12},{106,12},{106,4},{98,4}}, color={0,0,
63-
127}));
56+
connect(voltageSourceReImInput.vIm, imagPart.y) annotation (Line(points={{98,-4},{104,-4},{104,-20},{101,-20}}, color={0,0,127}));
57+
connect(realPart.y, voltageSourceReImInput.vRe) annotation (Line(points={{101,20},{104,20},{104,4},{98,4}}, color={0,0,127}));
6458
end SMIBAddOn;

‎OpenIPSL/Tests/BaseClasses/SMIBRenewable.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ equation
5353
annotation (Line(points={{16,0},{24,0},{24,20},{35,20}}, color={0,0,255}));
5454
connect(pwLine1.p,pwLine. p) annotation (Line(points={{35,-20},{24,-20},{24,20},
5555
{35,20}}, color={0,0,255}));
56-
connect(pwFault.p,FAULT. p) annotation (Line(points={{30.3333,-50},{20,-50},{
57-
20,0},{16,0}}, color={0,0,255}));
56+
connect(pwFault.p,FAULT. p) annotation (Line(points={{30.3333,-50},{20,-50},{20,0},{16,0}},
57+
color={0,0,255}));
5858
connect(pwLine.n,GEN2. p)
5959
annotation (Line(points={{53,20},{64,20},{64,0},{74,0}}, color={0,0,255}));
6060
connect(pwLine1.n,GEN2. p) annotation (Line(points={{53,-20},{64,-20},{64,0},{

‎OpenIPSL/Tests/BaseClasses/package.order‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
LoadTestBase
22
MachineTestBase
33
SMIB
4-
SMIBRenewable
54
SMIBAddOn
5+
SMIBRenewable
66
TGTestBase

‎OpenIPSL/Tests/Renewable/PSSE/PVPlantSolarIrradiance.mo‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ equation
140140
-24.08},{-82,-24},{-77.2,-24}}, color={0,0,127}));
141141
connect(limiter.y, add.u2) annotation (Line(points={{-63.4,-24},{-54,-24},{
142142
-54,-8},{-66,-8},{-66,0.4},{-57.2,0.4}}, color={0,0,127}));
143-
annotation (experiment(
144-
StopTime=86400), Documentation(info="<html>
143+
annotation (experiment(StopTime=86400), Documentation(info="<html>
145144
<p>
146145
Simulate for 5 seconds.
147146
</p>
@@ -154,12 +153,11 @@ This capability is not found in the original version of the WECC-based renewable
154153
<li><code>irradianceToPower.Ppv</code></li>
155154
</ul>
156155
</html>"),
157-
Diagram(coordinateSystem(extent={{-180,-100},{140,100}}), graphics={Text(
156+
Diagram(graphics={Text(
158157
extent={{-102,-8},{-78,-14}},
159158
textColor={0,0,0},
160159
textString="Noise"), Text(
161160
extent={{-40,12},{-24,6}},
162161
textColor={0,0,0},
163-
textString="Pinput")}),
164-
Icon(coordinateSystem(extent={{-180,-100},{140,100}})));
162+
textString="Pinput")}));
165163
end PVPlantSolarIrradiance;

0 commit comments

Comments
 (0)