Skip to content

Commit 945b3cb

Browse files
dietmarwdietmarw
committed
Create proper 0.3 release with correct folder structure for download.
Also removed distclean.py from released version.
2 parents 9d837c5 + f147a14 commit 945b3cb

File tree

135 files changed

+1909
-6061
lines changed

Some content is hidden

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

135 files changed

+1909
-6061
lines changed

‎PowerSystems 0.2/Blocks/package.mo

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎PowerSystems 0.2/Common/package.mo

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎PowerSystems 0.2/Control/package.mo

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎PowerSystems 0.2/Mechanics/package.mo

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎PowerSystems 0.2/Semiconductors/package.mo

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎PowerSystems 0.2/AC1ph_DC/Breakers.mo renamed to ‎PowerSystems 0.3/AC1ph_DC/Breakers.mo

Lines changed: 5 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ package Breakers "Breakers "
3434
r = relaxation(time - t0, t_relax, p_relax);
3535
{v,i} = if closed then {(r[1]+r[2]*epsR)*s,(r[1]*epsG+r[2])*s} else {(r[1]*epsR+r[2])*s,(r[1]+r[2]*epsG)*s};
3636
annotation (defaultComponentName = "switch1",
37-
Window(
38-
x=0.45,
39-
y=0.01,
40-
width=0.44,
41-
height=0.65),
4237
Documentation(
4338
info="<html>
4439
<p>Allows switching of single conductor (of totally one or two).<br>
@@ -97,7 +92,7 @@ with
9792
model ForcedCommSwitch "Forced commuting switch, 1-phase"
9893
extends Basic.Nominal.NominalVI;
9994

100-
parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
95+
parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
10196
"{resistance 'closed', conductance 'open'}";
10297
parameter SI.Time t_relax=10e-3 "switch relaxation time";
10398
parameter Integer p_relax(min=2)=4 "power of relaxation exponent";
@@ -158,11 +153,6 @@ with
158153
{v_t,i_t} = if closed_t then {(r[1]+r[2]*epsR)*s_t,(r[1]*epsG+r[2])*s_t} else {(r[1]*epsR+r[2])*s_t,(r[1]+r[2]*epsG)*s_t};
159154
{v_f,i_f} = if open_t then {(r[1]+r[2]*epsR)*s_f,(r[1]*epsG+r[2])*s_f} else {(r[1]*epsR+r[2])*s_f,(r[1]+r[2]*epsG)*s_f};
160155
annotation (defaultComponentName = "switch1",
161-
Window(
162-
x=0.45,
163-
y=0.01,
164-
width=0.44,
165-
height=0.65),
166156
Documentation(
167157
info="<html>
168158
<p>Allows switching of single conductor (of totally one or two).<br>
@@ -278,11 +268,6 @@ with
278268
connect(control, switch_1.closed)
279269
annotation (Line(points={{0,100},{0,60}}, color={255,0,255}));
280270
annotation (defaultComponentName = "switch1",
281-
Window(
282-
x=0.45,
283-
y=0.01,
284-
width=0.44,
285-
height=0.65),
286271
Documentation(
287272
info="<html>
288273
<p>Allows switching of single conductor (of totally one or two).</p>
@@ -326,11 +311,6 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
326311
connect(control, breaker_1.closed)
327312
annotation (Line(points={{0,100},{0,50}}, color={255,0,255}));
328313
annotation (defaultComponentName = "breaker1",
329-
Window(
330-
x=0.45,
331-
y=0.01,
332-
width=0.44,
333-
height=0.65),
334314
Documentation(
335315
info="<html>
336316
<p> Allows switching of single conductor (of totally one or two).</p>
@@ -390,11 +370,6 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
390370
{v[1],i[1]} = if closed[1] then {(r_1[1]+r_1[2]*epsR)*s[1],(r_1[1]*epsG+r_1[2])*s[1]} else {(r_1[1]*epsR+r_1[2])*s[1],(r_1[1]+r_1[2]*epsG)*s[1]};
391371
{v[2],i[2]} = if closed[2] then {(r_2[1]+r_2[2]*epsR)*s[2],(r_2[1]*epsG+r_2[2])*s[2]} else {(r_2[1]*epsR+r_2[2])*s[2],(r_2[1]+r_2[2]*epsG)*s[2]};
392372
annotation (defaultComponentName = "switch1",
393-
Window(
394-
x=0.45,
395-
y=0.01,
396-
width=0.44,
397-
height=0.65),
398373
Documentation(
399374
info="<html>
400375
<p>Allows double switching of double conductor.<br>
@@ -489,11 +464,6 @@ with
489464
connect(control[2], switch_2.closed) annotation (Line(points={{0,105},{0,
490465
80},{20,80},{20,0}}, color={255,0,255}));
491466
annotation (defaultComponentName = "switch1",
492-
Window(
493-
x=0.45,
494-
y=0.01,
495-
width=0.44,
496-
height=0.65),
497467
Documentation(
498468
info="<html>
499469
<p>Allows double switching of double conductor.</p>
@@ -549,11 +519,6 @@ if it is mechanically 'open' and the corresponding phase-current crosses zero.</
549519
connect(control[2], breaker_2.closed) annotation (Line(points={{0,105},{0,
550520
80},{20,80},{20,0}}, color={255,0,255}));
551521
annotation (defaultComponentName = "breaker1",
552-
Window(
553-
x=0.45,
554-
y=0.01,
555-
width=0.44,
556-
height=0.65),
557522
Documentation(
558523
info="<html>
559524
<p>Allows double switching of double conductor.</p>
@@ -582,19 +547,12 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
582547
extends Ports.Port_pn;
583548
extends Basic.Nominal.NominalVI;
584549

585-
parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
550+
parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
586551
"{resistance 'closed', conductance 'open'}";
587552
protected
588553
final parameter SI.Resistance epsR=eps[1]*V_nom/I_nom;
589554
final parameter SI.Conductance epsG=eps[2]*I_nom/V_nom;
590555
annotation (
591-
Window(
592-
x=
593-
0.45, y=
594-
0.01, width=
595-
0.44,
596-
height=
597-
0.65),
598556
Documentation(
599557
info="<html>
600558
</html>
@@ -635,13 +593,6 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
635593
i = term_p.i[1];
636594
term_p.v[2] = term_n.v[2];
637595
annotation (
638-
Window(
639-
x=
640-
0.45, y=
641-
0.01, width=
642-
0.44,
643-
height=
644-
0.65),
645596
Documentation(
646597
info="<html>
647598
<p>Allows one or two conductors. The first is switched.</p>
@@ -675,13 +626,6 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
675626
v = term_p.v - term_n.v;
676627
i = term_p.i;
677628
annotation (
678-
Window(
679-
x=
680-
0.45, y=
681-
0.01, width=
682-
0.44,
683-
height=
684-
0.65),
685629
Documentation(
686630
info="<html>
687631
<p>Both of two conductors are switched.</p>
@@ -700,13 +644,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
700644
Line(points={{-80,30},{-50,30}}, color={0,0,255}),
701645
Line(points={{10,30},{80,30}}, color={0,0,255})}));
702646
end DoubleSwitchBase;
703-
annotation ( Window(
704-
x=0.05,
705-
y=0.44,
706-
width=0.31,
707-
height=0.23,
708-
library=1,
709-
autolayout=1));
647+
710648
end Partials;
711649

712650
package Parameters "Parameter data for interactive use"
@@ -720,11 +658,6 @@ record BreakerArc "Breaker parameters, 3-phase"
720658
parameter Real R0=1 "small signal resistance arc";
721659

722660
annotation (defaultComponentName = "data",
723-
Window(
724-
x=0.45,
725-
y=0.01,
726-
width=0.44,
727-
height=0.65),
728661
Documentation(
729662
info="<html>
730663
</html>
@@ -737,14 +670,7 @@ height=0.65),
737670
extent={{-100,-100},{100,100}},
738671
grid={2,2}), graphics));
739672
end BreakerArc;
740-
annotation (preferedView="info",
741-
Window(
742-
x=0.05,
743-
y=0.41,
744-
width=0.4,
745-
height=0.38,
746-
library=1,
747-
autolayout=1),
673+
annotation (preferredView="info",
748674
Documentation(info="<html>
749675
<p>Records containing parameters of the corresponding components.</p>
750676
</html>"),
@@ -753,14 +679,7 @@ Documentation(info="<html>
753679
extent={{-100,-100},{100,100}},
754680
grid={2,2}), graphics));
755681
end Parameters;
756-
annotation (preferedView="info",
757-
Window(
758-
x=0.05,
759-
y=0.41,
760-
width=0.4,
761-
height=0.32,
762-
library=1,
763-
autolayout=1),
682+
annotation (preferredView="info",
764683
Documentation(info="<html>
765684
<p>Contains switches acting on one conductor only and double-switches acting on both conductors.</p>
766685
<p>Terminology:</p>

‎PowerSystems 0.2/AC1ph_DC/Drives.mo renamed to ‎PowerSystems 0.3/AC1ph_DC/Drives.mo

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ package Drives "DC-drives"
1717
connect(term, motor.term)
1818
annotation (Line(points={{-100,0},{-40,0}}, color={0,0,255}));
1919
annotation (defaultComponentName = "dcm_ser",
20-
Window(
21-
x=0.45,
22-
y=0.01,
23-
width=0.44,
24-
height=0.65),
2520
Documentation(
2621
info="<html>
2722
<p>Complete DC drive series connected.</p>
@@ -66,11 +61,6 @@ package Drives "DC-drives"
6661
connect(field, motor.field) annotation (Line(points={{-100,-40},{-60,-40},{
6762
-60,-4},{-40,-4}}, color={0,0,255}));
6863
annotation (defaultComponentName = "dcm_par",
69-
Window(
70-
x=0.45,
71-
y=0.01,
72-
width=0.44,
73-
height=0.65),
7464
Documentation(
7565
info="<html>
7666
<p>Complete DC drive parallel connected.</p>
@@ -111,11 +101,6 @@ package Drives "DC-drives"
111101
connect(term, motor.term)
112102
annotation (Line(points={{-100,0},{-40,0}}, color={0,0,255}));
113103
annotation (defaultComponentName = "dcm_pm",
114-
Window(
115-
x=0.45,
116-
y=0.01,
117-
width=0.44,
118-
height=0.65),
119104
Documentation(
120105
info="<html>
121106
<p>Complete DC drive permanent magnet excited.</p>
@@ -188,11 +173,6 @@ package Drives "DC-drives"
188173
connect(motor.uPhasor, inverter.uPhasor) annotation (Line(points={{-40,10},
189174
{-64,10}}, color={0,0,127}));
190175
annotation (defaultComponentName = "bldcm",
191-
Window(
192-
x=0.45,
193-
y=0.01,
194-
width=0.44,
195-
height=0.65),
196176
Documentation(
197177
info="<html>
198178
<p>Complete brushless DC drive with inverter.</p>
@@ -312,13 +292,6 @@ where 0 &lt uPhasor[1] &lt 1.</p>
312292
lineColor={255,170,85},
313293
fillColor={255,170,85},
314294
fillPattern=FillPattern.Solid)}),
315-
Window(
316-
x=0.41,
317-
y=0.01,
318-
width=
319-
0.6,
320-
height=
321-
0.6),
322295
Diagram(coordinateSystem(
323296
preserveAspectRatio=false,
324297
extent={{-100,-100},{100,100}},
@@ -334,7 +307,7 @@ where 0 &lt uPhasor[1] &lt 1.</p>
334307
end DriveBase;
335308

336309
model Synchron3rd_bldc
337-
"Synchronous machine, torque-control, 3rd order model, 3-phase dqo"
310+
"Synchronous machine, torque-control, 3rd order model, 3-phase dq0"
338311
extends AC3ph.Machines.Synchron3rd_pm(i_s(start={0,1,0}));
339312

340313
Modelica.Blocks.Interfaces.RealOutput rotorAngle=
@@ -381,23 +354,9 @@ Using a pu-current <tt>i_sd_pu</tt> we obtain
381354
fillPattern=FillPattern.Solid)}));
382355
end Synchron3rd_bldc;
383356

384-
annotation ( Window(
385-
x=0.05,
386-
y=0.44,
387-
width=0.31,
388-
height=0.23,
389-
library=1,
390-
autolayout=1));
391357
end Partials;
392358

393-
annotation (preferedView="info",
394-
Window(
395-
x=0.05,
396-
y=0.41,
397-
width=0.4,
398-
height=0.32,
399-
library=1,
400-
autolayout=1),
359+
annotation (preferredView="info",
401360
Documentation(info="<html>
402361
<p>Contains both electrical and mechanical parts of DC-drives.</p>
403362
<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>

0 commit comments

Comments
 (0)