Skip to content

Commit b132b6f

Browse files
committed
Cleaning up white spaces and annotations with ttws
1 parent ec8b081 commit b132b6f

11 files changed

Lines changed: 16 additions & 20 deletions

File tree

OpenIPSL/Examples/Tutorial/Example_4/BaseModels/BaseNetwork/SMIBPartial.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ within OpenIPSL.Examples.Tutorial.Example_4.BaseModels.BaseNetwork;
22
model SMIBPartial "Partial SMIB Model with PF Record and Load"
33
OpenIPSL.Electrical.Buses.Bus B01(
44
v_0=pf.powerflow.bus.v1,
5-
angle_0=pf.powerflow.bus.A1, displayPF=true)
5+
angle_0=pf.powerflow.bus.A1, displayPF=true)
66
annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
77
OpenIPSL.Electrical.Buses.Bus B03(
88
v_0=pf.powerflow.bus.v3,
9-
angle_0=pf.powerflow.bus.A3, displayPF=true)
9+
angle_0=pf.powerflow.bus.A3, displayPF=true)
1010
annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
1111
OpenIPSL.Electrical.Buses.Bus B04(
1212
v_0=pf.powerflow.bus.v4,
13-
angle_0=pf.powerflow.bus.A4, displayPF=true)
13+
angle_0=pf.powerflow.bus.A4, displayPF=true)
1414
annotation (Placement(transformation(extent={{10,-30},{30,-10}})));
1515
OpenIPSL.Electrical.Buses.Bus B02(
1616
v_0=pf.powerflow.bus.v2,
17-
angle_0=pf.powerflow.bus.A2, displayPF=true)
17+
angle_0=pf.powerflow.bus.A2, displayPF=true)
1818
annotation (Placement(transformation(extent={{50,-10},{70,10}})));
1919
OpenIPSL.Electrical.Branches.PwLine line_01(
2020
R=0.0010,
@@ -43,7 +43,7 @@ model SMIBPartial "Partial SMIB Model with PF Record and Load"
4343
P_0=pf.powerflow.machine.PG2,
4444
Q_0=pf.powerflow.machine.QG2,
4545
v_0=pf.powerflow.bus.v2,
46-
angle_0=pf.powerflow.bus.A2, displayPF=true)
46+
angle_0=pf.powerflow.bus.A2, displayPF=true)
4747
annotation (Placement(transformation(extent={{94,-10},{74,10}})));
4848
replaceable
4949
OpenIPSL.Electrical.Loads.PSSE.Load load(

OpenIPSL/Examples/Tutorial/Example_4/BaseModels/GeneratingUnits/GeneratorTurbGov.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ equation
5555
connect(gENROE.EFD0, gENROE.EFD) annotation (Line(points={{76.4,-14},{92,
5656
-14},{92,-40},{-40,-40},{-40,-16.8},{-24.8,-16.8}},
5757
color={0,0,127}));
58-
annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
58+
annotation (
5959
Diagram(
6060
coordinateSystem(preserveAspectRatio=false, extent={{-140,-100},{100,
6161
100}})));

OpenIPSL/Examples/Tutorial/Example_4/BaseModels/GeneratingUnits/GeneratorTurbGovAVR.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ equation
104104
0}}, color={0,0,255}));
105105
connect(const3.y, eSST1A1.VOTHSG) annotation (Line(points={{-33,-36},{-72,-36},
106106
{-72,-26},{-107,-26}}, color={0,0,127}));
107-
annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
107+
annotation (
108108
Diagram(
109109
coordinateSystem(preserveAspectRatio=false, extent={{-220,-120},{100,120}})));
110110
end GeneratorTurbGovAVR;

OpenIPSL/Examples/Tutorial/Example_4/BaseModels/GeneratingUnits/GeneratorTurbGovAVRPSS.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ equation
125125
52.2},{-96,52.2},{-96,28.4},{-59,28.4}}, color={0,140,72}));
126126
connect(gENROE.p, pwPin) annotation (Line(points={{40,11},{90,11},{90,0},{110,
127127
0}}, color={0,0,255}));
128-
annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
128+
annotation (
129129
Diagram(
130130
coordinateSystem(preserveAspectRatio=false, extent={{-220,-120},{100,120}})));
131131
end GeneratorTurbGovAVRPSS;

OpenIPSL/Examples/Tutorial/Example_4/Instructions/DefiningGenerationGroups.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ model DefiningGenerationGroups "More Detailed GU Models"
4444
<img src=\"modelica://OpenIPSL/Resources/images/example_4/DefiningGenerationGroups/ResultsToKeep.png\" alt=\"ResultsToKeep\" />
4545
</p>
4646
</li>
47-
<li>Go back to the diagram layer for the <font color=\"blue\"><code>SMIB</code></font> model and right-click the <em>genunit</em> block to change the class to the \" <em>Machine with Turbine and Governor</em>\" option.
47+
<li>Go back to the diagram layer for the <font color=\"blue\"><code>SMIB</code></font> model and right-click the <em>genunit</em> block to change the class to the \" <em>Machine with Turbine and Governor</em>\" option.
4848
<p>
4949
<img src=\"modelica://OpenIPSL/Resources/images/example_4/DefiningGenerationGroups/ChangeClassToMachineWithTurbGovernor.png\" alt=\"ChangeClassToMachineWithTurbGovernor\" />
5050
</p>

OpenIPSL/Examples/Tutorial/Example_4/Instructions/InstallingGridCal.mo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ The following NEW packages will be INSTALLED:
4646
wheel pkgs/main/noarch::wheel-0.37.1-pyhd3eb1b0_0
4747
wincertstore pkgs/main/win-64::wincertstore-0.2-py39haa95532_2
4848
49-
5049
Proceed ([y]/n)?
5150
</pre></blockquote>
5251
</li>

OpenIPSL/Examples/Tutorial/Example_4/Instructions/PFRecordCreation.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ args = parser.parse_args()
4848
data_path = os.path.abspath(os.path.join(os.getcwd(), <em>\"models\"</em>, _model))
4949
5050
path_mo_file = os.path.abspath(os.path.join(data_path, <em>f\"</em>{_model}<em>Total.mo\"</em>))
51-
51+
5252
<em># Remove Modelica code lines from the '.mo' file that alter the expected input for</em>
5353
<em># pf2rec functions (the GenerationUnits package section of Modelica code should </em>
5454
<em># be excluded)</em>
@@ -66,7 +66,7 @@ args = parser.parse_args()
6666
includeCodeLine = True
6767
<strong>if</strong> includeCodeLine:
6868
new_lines.append(l);
69-
69+
7070
<strong>with</strong> open(path_mo_file, <em>\"w\"</em>) <strong>as</strong> mo_file:
7171
<strong>for</strong> l <strong>in</strong> new_lines:
7272
mo_file.write(<em>\"{}\"</em>.format(l))

OpenIPSL/Examples/Tutorial/Example_4/Instructions/PopulatingRecords.mo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ args = parser.parse_args()
4444
<strong>if</strong> _model <strong>not in</strong> LIST_OF_MODELS:
4545
<strong>raise</strong> ValueError(<em>'Model not available'</em>)
4646
47-
4847
# Absolute path to the data directory of the model
4948
data_path = os.path.abspath(os.path.join(os.getcwd(), <em>\"models\"</em>, _model))
5049

OpenIPSL/Examples/Tutorial/Example_4/Instructions/SMIBSystemAssembly.mo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ model SMIBSystemAssembly "Assembling a SMIB System"
1212
</p>
1313
</li>
1414
<li>Inside <font color=\"blue\"><code>SMIB</code></font> create two sub-packages named <font color=\"blue\"><code>Experiments</code></font> and <font color=\"blue\"><code>BaseModels</code></font>. Then add two sub-packages inside <font color=\"blue\"><code>BaseModels</code></font> called <font color=\"blue\"><code>GenerationUnits</code></font> and <font color=\"blue\"><code>BaseNetwork</code></font>. Once again, remember to keep the option to &#34; <em>save the contents of the package in one file</em>&#34; unselected. </li>
15-
<li>To follow the structure and appearance convention of packages in Modelica, we can add an icon to the <font color=\"blue\"><code>Experiments</code></font> package. Double-click the <font color=\"blue\"><code>Experiments</code></font> package and go to the text layer to add the following line of class extension:
15+
<li>To follow the structure and appearance convention of packages in Modelica, we can add an icon to the <font color=\"blue\"><code>Experiments</code></font> package. Double-click the <font color=\"blue\"><code>Experiments</code></font> package and go to the text layer to add the following line of class extension:
1616
<blockquote><pre>
1717
<strong>package</strong> Experiments
1818
<strong>extends</strong> <em>Modelica.Icons.Example</em>;
@@ -43,12 +43,12 @@ model SMIBSystemAssembly "Assembling a SMIB System"
4343
<img src=\"modelica://OpenIPSL/Resources/images/example_4/SMIBSystemAssembly//DefaultGENROEConnections.png\" alt=\"DefaultGENROEConnections\" />
4444
</p>
4545
</li>
46-
<li>Double click the <font color=\"blue\"><code>GENCLS</code></font> block inside the <font color=\"blue\"><code>InfiniteBus</code></font> model. Be sure to enter all the machine parameters in the figure below:
46+
<li>Double click the <font color=\"blue\"><code>GENCLS</code></font> block inside the <font color=\"blue\"><code>InfiniteBus</code></font> model. Be sure to enter all the machine parameters in the figure below:
4747
<p>
4848
<img src=\"modelica://OpenIPSL/Resources/images/example_4/SMIBSystemAssembly//GENCLSMachineParameters.png\" alt=\"GENCLSMachineParameters\" />
4949
</p>
5050
</li>
51-
<li>Switch to the Modelica Text of the <font color=\"blue\"><code>InfiniteBus</code></font> model. Propagate the power flow parameters one layer up as indicated in the highlighted text of the following code chunk:
51+
<li>Switch to the Modelica Text of the <font color=\"blue\"><code>InfiniteBus</code></font> model. Propagate the power flow parameters one layer up as indicated in the highlighted text of the following code chunk:
5252
<blockquote><pre>
5353
<strong>model</strong> InfiniteBus
5454
<strong>extends</strong> <em>OpenIPSL.Interfaces.Generator</em>;

OpenIPSL/Examples/Tutorial/Example_4/PFData/PowerFlow.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ record PowerFlow
1111

1212
PowerFlow powerflow;
1313

14-
annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
15-
coordinateSystem(preserveAspectRatio=false)));
14+
1615
end PowerFlow;

0 commit comments

Comments
 (0)