Skip to content

Commit fa04fe5

Browse files
tbeutbeu
committed
Remove dummy annotations
1 parent 9bc36fd commit fa04fe5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2194
-5769
lines changed

‎PowerSystems/AC1ph_DC/Breakers.mo

Lines changed: 20 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,11 @@ with
102102
SI.Current[2] i_f;
103103

104104
Ports.TwoPin_p term_p "positive terminal"
105-
annotation (Placement(transformation(extent={{-110,-10},{-90,10}},
106-
rotation=0)));
105+
annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
107106
Ports.TwoPin_n term_nt "negative terminal"
108-
annotation (Placement(transformation(extent={{90,30},{110,50}}, rotation=
109-
0)));
107+
annotation (Placement(transformation(extent={{90,30},{110,50}})));
110108
Ports.TwoPin_n term_nf "negative terminal"
111-
annotation (Placement(transformation(extent={{90,-50},{110,-30}},
112-
rotation=0)));
109+
annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
113110
Modelica.Blocks.Interfaces.BooleanInput control
114111
"true: p - nt closed, false: p - nf closed"
115112
annotation (Placement(transformation(
@@ -260,7 +257,7 @@ with
260257
Common.Switching.Switch switch_1(
261258
epsR=epsR,
262259
epsG=epsG) annotation (Placement(transformation(extent={{
263-
-40,0},{40,60}}, rotation=0)));
260+
-40,0},{40,60}})));
264261

265262
equation
266263
switch_1.v = v;
@@ -281,19 +278,15 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
281278
grid={2,2}), graphics={Line(
282279
points={{-40,0},{40,0}},
283280
color={0,0,255},
284-
pattern=LinePattern.Dot)}),
285-
Diagram(coordinateSystem(
286-
preserveAspectRatio=false,
287-
extent={{-100,-100},{100,100}},
288-
grid={2,2}), graphics));
281+
pattern=LinePattern.Dot)}));
289282
end Switch;
290283

291284
model Breaker "Breaker, 1-phase"
292285
extends Partials.SwitchBase;
293286

294287
replaceable Parameters.BreakerArc par "breaker parameter"
295288
annotation (Placement(
296-
transformation(extent={{60,70},{80,90}}, rotation=0)));
289+
transformation(extent={{60,70},{80,90}})));
297290
protected
298291
Common.Switching.Breaker breaker_1(
299292
D=par.D,
@@ -302,8 +295,7 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
302295
R0=par.R0,
303296
epsR=epsR,
304297
epsG=epsG)
305-
annotation (Placement(transformation(extent={{-20,10},{20,50}},
306-
rotation=0)));
298+
annotation (Placement(transformation(extent={{-20,10},{20,50}})));
307299

308300
equation
309301
breaker_1.v = v;
@@ -325,11 +317,7 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
325317
grid={2,2}), graphics={Line(
326318
points={{-40,0},{-22,-6},{-10,-4},{2,4},{16,-4},{30,2},{40,0}},
327319
color={255,255,0},
328-
thickness=0.5)}),
329-
Diagram(coordinateSystem(
330-
preserveAspectRatio=false,
331-
extent={{-100,-100},{100,100}},
332-
grid={2,2}), graphics));
320+
thickness=0.5)}));
333321
end Breaker;
334322

335323
model ForcedDoubleSwitch "Forced double switch, 1-phase"
@@ -448,11 +436,11 @@ with
448436
Common.Switching.Switch switch_1(
449437
epsR=epsR,
450438
epsG=epsG) annotation (Placement(transformation(extent={
451-
{-60,0},{20,60}}, rotation=0)));
439+
{-60,0},{20,60}})));
452440
Common.Switching.Switch switch_2(
453441
epsR=epsR,
454442
epsG=epsG) annotation (Placement(transformation(extent={
455-
{-20,-60},{60,0}}, rotation=0)));
443+
{-20,-60},{60,0}})));
456444

457445
equation
458446
switch_1.v = v[1];
@@ -478,19 +466,15 @@ if it is mechanically 'open' and the corresponding phase-current crosses zero.</
478466
grid={2,2}), graphics={Line(
479467
points={{-40,0},{40,0}},
480468
color={0,0,255},
481-
pattern=LinePattern.Dot)}),
482-
Diagram(coordinateSystem(
483-
preserveAspectRatio=false,
484-
extent={{-100,-100},{100,100}},
485-
grid={2,2}), graphics));
469+
pattern=LinePattern.Dot)}));
486470
end DoubleSwitch;
487471

488472
model DoubleBreaker "Double breaker, 1-phase"
489473
extends Partials.DoubleSwitchBase;
490474

491475
replaceable Parameters.BreakerArc par "breaker parameter"
492476
annotation (Placement(
493-
transformation(extent={{60,70},{80,90}}, rotation=0)));
477+
transformation(extent={{60,70},{80,90}})));
494478
protected
495479
replaceable Common.Switching.Breaker breaker_1(
496480
D=par.D,
@@ -499,15 +483,15 @@ if it is mechanically 'open' and the corresponding phase-current crosses zero.</
499483
R0=par.R0,
500484
epsR=epsR,
501485
epsG=epsG) annotation (Placement(transformation(extent={
502-
{-60,0},{20,60}}, rotation=0)));
486+
{-60,0},{20,60}})));
503487
replaceable Common.Switching.Breaker breaker_2(
504488
D=par.D,
505489
t_opening=par.t_opening,
506490
Earc=par.Earc,
507491
R0=par.R0,
508492
epsR=epsR,
509493
epsG=epsG) annotation (Placement(transformation(extent={
510-
{-20,-60},{60,0}}, rotation=0)));
494+
{-20,-60},{60,0}})));
511495

512496
equation
513497
breaker_1.v = v[1];
@@ -533,11 +517,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
533517
grid={2,2}), graphics={Line(
534518
points={{-40,0},{-22,-6},{-10,-4},{2,4},{16,-4},{30,2},{40,0}},
535519
color={255,255,0},
536-
thickness=0.5)}),
537-
Diagram(coordinateSystem(
538-
preserveAspectRatio=false,
539-
extent={{-100,-100},{100,100}},
540-
grid={2,2}), graphics));
520+
thickness=0.5)}));
541521
end DoubleBreaker;
542522

543523
package Partials "Partial models"
@@ -570,11 +550,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
570550
Line(
571551
points={{0,90},{0,34}},
572552
color={255,0,255},
573-
pattern=LinePattern.Dot)}),
574-
Diagram(coordinateSystem(
575-
preserveAspectRatio=false,
576-
extent={{-100,-100},{100,100}},
577-
grid={2,2}), graphics));
553+
pattern=LinePattern.Dot)}));
578554
end SwitchBase0;
579555

580556
partial model SwitchBase "Switch base, 1-phase"
@@ -597,11 +573,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
597573
info="<html>
598574
<p>Allows one or two conductors. The first is switched.</p>
599575
</html>
600-
"), Icon(coordinateSystem(
601-
preserveAspectRatio=false,
602-
extent={{-100,-100},{100,100}},
603-
grid={2,2}), graphics),
604-
Diagram(coordinateSystem(
576+
"), Diagram(coordinateSystem(
605577
preserveAspectRatio=false,
606578
extent={{-100,-100},{100,100}},
607579
grid={2,2}), graphics={
@@ -661,23 +633,12 @@ record BreakerArc "Breaker parameters, 3-phase"
661633
Documentation(
662634
info="<html>
663635
</html>
664-
"), Icon(coordinateSystem(
665-
preserveAspectRatio=false,
666-
extent={{-100,-100},{100,100}},
667-
grid={2,2}), graphics),
668-
Diagram(coordinateSystem(
669-
preserveAspectRatio=false,
670-
extent={{-100,-100},{100,100}},
671-
grid={2,2}), graphics));
636+
"));
672637
end BreakerArc;
673638
annotation (preferredView="info",
674639
Documentation(info="<html>
675640
<p>Records containing parameters of the corresponding components.</p>
676-
</html>"),
677-
Icon(coordinateSystem(
678-
preserveAspectRatio=false,
679-
extent={{-100,-100},{100,100}},
680-
grid={2,2}), graphics));
641+
</html>"));
681642
end Parameters;
682643
annotation (preferredView="info",
683644
Documentation(info="<html>
@@ -687,8 +648,5 @@ Documentation(info="<html>
687648
<tt><b>Switch</b></tt> is used for a component, that breaks the current during zero-crossing but does not contain any additional physical properties like arc-voltage etc.<br>
688649
<tt><b>Breaker</b></tt> is used for a component that acts basically like a 'Switch' but contains additionally physical properties of plasma-arcs, opening duration etc.</p>
689650
</html>
690-
"), Icon(coordinateSystem(
691-
preserveAspectRatio=false,
692-
extent={{-100,-100},{100,100}},
693-
grid={2,2}), graphics));
651+
"));
694652
end Breakers;

‎PowerSystems/AC1ph_DC/Drives.mo

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package Drives "DC-drives"
77

88
replaceable PowerSystems.AC1ph_DC.Machines.DCser motor(w_el_ini=w_ini*motor.par.pp)
99
"DC motor series" annotation (Placement(transformation(
10-
extent={{-40,-10},{-20,10}}, rotation=0)));
10+
extent={{-40,-10},{-20,10}})));
1111

1212
equation
1313
connect(motor.heat, heat) annotation (Line(points={{-30,10},{-30,40},{0,40},
@@ -34,22 +34,17 @@ package Drives "DC-drives"
3434
Line(points={{-90,-10},{-60,-10}}, color={0,0,255}),
3535
Line(points={{-90,10},{-80,10},{-80,50},{-60,50}}, color={0,0,255}),
3636
Line(points={{-60,10},{-70,10},{-70,-6}}, color={0,0,255}),
37-
Line(points={{-70,-14},{-70,-50},{-60,-50}}, color={0,0,255})}),
38-
Diagram(coordinateSystem(
39-
preserveAspectRatio=false,
40-
extent={{-100,-100},{100,100}},
41-
grid={2,2}), graphics));
37+
Line(points={{-70,-14},{-70,-50},{-60,-50}}, color={0,0,255})}));
4238
end DCMser;
4339

4440
model DCMpar "DC machine, parallel connected"
4541
extends Partials.DriveBase(heat(final m=2));
4642

4743
replaceable PowerSystems.AC1ph_DC.Machines.DCpar motor(w_el_ini=w_ini*motor.par.pp)
4844
"DC motor parallel" annotation (Placement(transformation(
49-
extent={{-40,-10},{-20,10}}, rotation=0)));
45+
extent={{-40,-10},{-20,10}})));
5046
AC1ph_DC.Ports.TwoPin_p field
51-
annotation (Placement(transformation(extent={{-110,-50},{-90,-30}},
52-
rotation=0)));
47+
annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
5348

5449
equation
5550
connect(motor.heat, heat) annotation (Line(points={{-30,10},{-30,40},{0,40},
@@ -79,19 +74,15 @@ package Drives "DC-drives"
7974
"DC par"),
8075
Line(points={{-90,-50},{-60,-50}}, color={0,0,255}),
8176
Line(points={{-60,50},{-68,50},{-68,14}}, color={0,0,255}),
82-
Line(points={{-68,-14},{-68,-30},{-90,-30}}, color={0,0,255})}),
83-
Diagram(coordinateSystem(
84-
preserveAspectRatio=false,
85-
extent={{-100,-100},{100,100}},
86-
grid={2,2}), graphics));
77+
Line(points={{-68,-14},{-68,-30},{-90,-30}}, color={0,0,255})}));
8778
end DCMpar;
8879

8980
model DCMpm "DC machine, permanent magnet"
9081
extends Partials.DriveBase(heat(final m=2));
9182

9283
replaceable PowerSystems.AC1ph_DC.Machines.DCpm motor(w_el_ini=w_ini*motor.par.pp)
9384
"DC motor magnet" annotation (Placement(transformation(
94-
extent={{-40,-10},{-20,10}}, rotation=0)));
85+
extent={{-40,-10},{-20,10}})));
9586

9687
equation
9788
connect(motor.heat, heat) annotation (Line(points={{-30,10},{-30,40},{0,40},
@@ -126,11 +117,7 @@ package Drives "DC-drives"
126117
extent={{-60,-40},{80,-44}},
127118
lineColor={176,0,0},
128119
fillColor={176,0,0},
129-
fillPattern=FillPattern.Solid)}),
130-
Diagram(coordinateSystem(
131-
preserveAspectRatio=false,
132-
extent={{-100,-100},{100,100}},
133-
grid={2,2}), graphics));
120+
fillPattern=FillPattern.Solid)}));
134121
end DCMpm;
135122

136123
model BLDC "BLDC machine"
@@ -144,16 +131,15 @@ package Drives "DC-drives"
144131
choice(redeclare PowerSystems.AC3ph.Inverters.Inverter inverter(redeclare final
145132
Control.Modulation.BlockM modulator
146133
"block modulation (no PWM)") "inverter with modulator")),
147-
Placement(transformation(extent={{-80,-10},{-60,10}}, rotation=0)));
134+
Placement(transformation(extent={{-80,-10},{-60,10}})));
148135
replaceable Partials.Synchron3rd_bldc motor(
149136
w_el_ini=w_ini*motor.par.pp) "BLDC motor (syn pm machine)"
150137
annotation ( choices(
151138
choice(redeclare PowerSystems.AC3ph.Machines.Synchron3rd_bldc motor
152139
"synchron 3rd order")), Placement(transformation(extent={{-40,-10},
153-
{-20,10}}, rotation=0)));
140+
{-20,10}})));
154141
Common.Thermal.HeatV_a_b_ab heat_adapt(final m={2,inverter.heat.m})
155-
annotation (Placement(transformation(extent={{10,60},{-10,80}}, rotation=
156-
0)));
142+
annotation (Placement(transformation(extent={{10,60},{-10,80}})));
157143

158144
equation
159145
connect(motor.heat, heat_adapt.port_a) annotation (Line(points={{-30,10},{
@@ -202,11 +188,7 @@ where 0 &lt uPhasor[1] &lt 1.</p>
202188
extent={{-60,20},{80,-20}},
203189
lineColor={128,128,128},
204190
textString=
205-
"BLDC")}),
206-
Diagram(coordinateSystem(
207-
preserveAspectRatio=false,
208-
extent={{-100,-100},{100,100}},
209-
grid={2,2}), graphics));
191+
"BLDC")}));
210192
end BLDC;
211193

212194
package Partials "Partial models"
@@ -218,22 +200,21 @@ where 0 &lt uPhasor[1] &lt 1.</p>
218200
"initial rpm (start-value if ini='st')"
219201
annotation(Dialog(enable=not system.steadyIni));
220202
AC1ph_DC.Ports.TwoPin_p term "electric terminal"
221-
annotation (Placement(transformation(extent={{-110,-10},{-90,10}}, rotation=0)));
203+
annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
222204
Interfaces.Rotation_n flange "mechanical flange"
223-
annotation (Placement(transformation(extent={{90,-10},{110,10}}, rotation=
224-
0)));
205+
annotation (Placement(transformation(extent={{90,-10},{110,10}})));
225206
replaceable PowerSystems.Mechanics.Rotation.ElectricRotor rotor(w(start=w_ini))
226207
"machine rotor"
227208
annotation (Placement(transformation(extent={{0,-10},{20,
228-
10}}, rotation=0)));
209+
10}})));
229210
replaceable PowerSystems.Mechanics.Rotation.NoGear gear "type of gear"
230211
annotation ( choices(
231212
choice(redeclare PowerSystems.Mechanics.Rotation.Joint gear "no gear"),
232213
choice(redeclare PowerSystems.Mechanics.Rotation.GearNoMass gear
233214
"massless gear"),
234215
choice(redeclare PowerSystems.Mechanics.Rotation.Gear gear
235216
"massive gear")),
236-
Placement(transformation(extent={{40,-10},{60,10}}, rotation=0)));
217+
Placement(transformation(extent={{40,-10},{60,10}})));
237218
Interfaces.ThermalV_n heat( m=2) "heat source port {stator, rotor}"
238219
annotation (Placement(transformation(
239220
origin={0,100},
@@ -361,8 +342,5 @@ Documentation(info="<html>
361342
<p>Contains both electrical and mechanical parts of DC-drives.</p>
362343
<p>Heat ports must be connected. In cases where they are not needed, use 'Common.Thermal.BdCond(V)'.</p><p><a <p><a href=\"PowerSystems.UsersGuide.Overview\">up users guide</a></p>
363344
</html>
364-
"), Icon(coordinateSystem(
365-
preserveAspectRatio=false,
366-
extent={{-100,-100},{100,100}},
367-
grid={2,2}), graphics));
345+
"));
368346
end Drives;

0 commit comments

Comments
 (0)