Skip to content

Commit

Permalink
Create proper 0.3 release with correct folder structure for download.
Browse files Browse the repository at this point in the history
Also removed distclean.py from released version.
  • Loading branch information
dietmarw committed Oct 20, 2014
2 parents 9d837c5 + f147a14 commit 945b3cb
Show file tree
Hide file tree
Showing 135 changed files with 1,909 additions and 6,061 deletions.
17 changes: 0 additions & 17 deletions PowerSystems 0.2/Blocks/package.mo

This file was deleted.

18 changes: 0 additions & 18 deletions PowerSystems 0.2/Common/package.mo

This file was deleted.

18 changes: 0 additions & 18 deletions PowerSystems 0.2/Control/package.mo

This file was deleted.

18 changes: 0 additions & 18 deletions PowerSystems 0.2/Mechanics/package.mo

This file was deleted.

18 changes: 0 additions & 18 deletions PowerSystems 0.2/Semiconductors/package.mo

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ package Breakers "Breakers "
r = relaxation(time - t0, t_relax, p_relax);
{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};
annotation (defaultComponentName = "switch1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows switching of single conductor (of totally one or two).<br>
Expand Down Expand Up @@ -97,7 +92,7 @@ with
model ForcedCommSwitch "Forced commuting switch, 1-phase"
extends Basic.Nominal.NominalVI;

parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
"{resistance 'closed', conductance 'open'}";
parameter SI.Time t_relax=10e-3 "switch relaxation time";
parameter Integer p_relax(min=2)=4 "power of relaxation exponent";
Expand Down Expand Up @@ -158,11 +153,6 @@ with
{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};
{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};
annotation (defaultComponentName = "switch1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows switching of single conductor (of totally one or two).<br>
Expand Down Expand Up @@ -278,11 +268,6 @@ with
connect(control, switch_1.closed)
annotation (Line(points={{0,100},{0,60}}, color={255,0,255}));
annotation (defaultComponentName = "switch1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows switching of single conductor (of totally one or two).</p>
Expand Down Expand Up @@ -326,11 +311,6 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
connect(control, breaker_1.closed)
annotation (Line(points={{0,100},{0,50}}, color={255,0,255}));
annotation (defaultComponentName = "breaker1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p> Allows switching of single conductor (of totally one or two).</p>
Expand Down Expand Up @@ -390,11 +370,6 @@ Electrically the switch is on if it is 'closed', whereas it is switched off, if
{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]};
{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]};
annotation (defaultComponentName = "switch1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows double switching of double conductor.<br>
Expand Down Expand Up @@ -489,11 +464,6 @@ with
connect(control[2], switch_2.closed) annotation (Line(points={{0,105},{0,
80},{20,80},{20,0}}, color={255,0,255}));
annotation (defaultComponentName = "switch1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows double switching of double conductor.</p>
Expand Down Expand Up @@ -549,11 +519,6 @@ if it is mechanically 'open' and the corresponding phase-current crosses zero.</
connect(control[2], breaker_2.closed) annotation (Line(points={{0,105},{0,
80},{20,80},{20,0}}, color={255,0,255}));
annotation (defaultComponentName = "breaker1",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Allows double switching of double conductor.</p>
Expand Down Expand Up @@ -582,19 +547,12 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
extends Ports.Port_pn;
extends Basic.Nominal.NominalVI;

parameter Real[2] eps(final min={0,0}, unit="1")={1e-4,1e-4}
parameter Real[2] eps(final min={0,0}, each unit="1")={1e-4,1e-4}
"{resistance 'closed', conductance 'open'}";
protected
final parameter SI.Resistance epsR=eps[1]*V_nom/I_nom;
final parameter SI.Conductance epsG=eps[2]*I_nom/V_nom;
annotation (
Window(
x=
0.45, y=
0.01, width=
0.44,
height=
0.65),
Documentation(
info="<html>
</html>
Expand Down Expand Up @@ -635,13 +593,6 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
i = term_p.i[1];
term_p.v[2] = term_n.v[2];
annotation (
Window(
x=
0.45, y=
0.01, width=
0.44,
height=
0.65),
Documentation(
info="<html>
<p>Allows one or two conductors. The first is switched.</p>
Expand Down Expand Up @@ -675,13 +626,6 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
v = term_p.v - term_n.v;
i = term_p.i;
annotation (
Window(
x=
0.45, y=
0.01, width=
0.44,
height=
0.65),
Documentation(
info="<html>
<p>Both of two conductors are switched.</p>
Expand All @@ -700,13 +644,7 @@ if it is mechanically fully 'open' (after a given opening duration) and the corr
Line(points={{-80,30},{-50,30}}, color={0,0,255}),
Line(points={{10,30},{80,30}}, color={0,0,255})}));
end DoubleSwitchBase;
annotation ( Window(
x=0.05,
y=0.44,
width=0.31,
height=0.23,
library=1,
autolayout=1));

end Partials;

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

annotation (defaultComponentName = "data",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
</html>
Expand All @@ -737,14 +670,7 @@ height=0.65),
extent={{-100,-100},{100,100}},
grid={2,2}), graphics));
end BreakerArc;
annotation (preferedView="info",
Window(
x=0.05,
y=0.41,
width=0.4,
height=0.38,
library=1,
autolayout=1),
annotation (preferredView="info",
Documentation(info="<html>
<p>Records containing parameters of the corresponding components.</p>
</html>"),
Expand All @@ -753,14 +679,7 @@ Documentation(info="<html>
extent={{-100,-100},{100,100}},
grid={2,2}), graphics));
end Parameters;
annotation (preferedView="info",
Window(
x=0.05,
y=0.41,
width=0.4,
height=0.32,
library=1,
autolayout=1),
annotation (preferredView="info",
Documentation(info="<html>
<p>Contains switches acting on one conductor only and double-switches acting on both conductors.</p>
<p>Terminology:</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ package Drives "DC-drives"
connect(term, motor.term)
annotation (Line(points={{-100,0},{-40,0}}, color={0,0,255}));
annotation (defaultComponentName = "dcm_ser",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Complete DC drive series connected.</p>
Expand Down Expand Up @@ -66,11 +61,6 @@ package Drives "DC-drives"
connect(field, motor.field) annotation (Line(points={{-100,-40},{-60,-40},{
-60,-4},{-40,-4}}, color={0,0,255}));
annotation (defaultComponentName = "dcm_par",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Complete DC drive parallel connected.</p>
Expand Down Expand Up @@ -111,11 +101,6 @@ package Drives "DC-drives"
connect(term, motor.term)
annotation (Line(points={{-100,0},{-40,0}}, color={0,0,255}));
annotation (defaultComponentName = "dcm_pm",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Complete DC drive permanent magnet excited.</p>
Expand Down Expand Up @@ -188,11 +173,6 @@ package Drives "DC-drives"
connect(motor.uPhasor, inverter.uPhasor) annotation (Line(points={{-40,10},
{-64,10}}, color={0,0,127}));
annotation (defaultComponentName = "bldcm",
Window(
x=0.45,
y=0.01,
width=0.44,
height=0.65),
Documentation(
info="<html>
<p>Complete brushless DC drive with inverter.</p>
Expand Down Expand Up @@ -312,13 +292,6 @@ where 0 &lt uPhasor[1] &lt 1.</p>
lineColor={255,170,85},
fillColor={255,170,85},
fillPattern=FillPattern.Solid)}),
Window(
x=0.41,
y=0.01,
width=
0.6,
height=
0.6),
Diagram(coordinateSystem(
preserveAspectRatio=false,
extent={{-100,-100},{100,100}},
Expand All @@ -334,7 +307,7 @@ where 0 &lt uPhasor[1] &lt 1.</p>
end DriveBase;

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

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

annotation ( Window(
x=0.05,
y=0.44,
width=0.31,
height=0.23,
library=1,
autolayout=1));
end Partials;

annotation (preferedView="info",
Window(
x=0.05,
y=0.41,
width=0.4,
height=0.32,
library=1,
autolayout=1),
annotation (preferredView="info",
Documentation(info="<html>
<p>Contains both electrical and mechanical parts of DC-drives.</p>
<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>
Expand Down
Loading

0 comments on commit 945b3cb

Please sign in to comment.