Changeset 707

Timestamp:

10/16/2007 08:01:56 AM (15 months ago)

Author:

AHaumer

Message:

 

Files:

• Modelica/trunk/Modelica/Electrical/MultiPhase.mo (modified) (31 diffs)

Modelica/trunk/Modelica/Electrical/MultiPhase.mo

@@ -1 +1 @@
 within Modelica.Electrical;
+
+
 package MultiPhase "Library for electrical components with 2, 3 or more phases" 
   extends Modelica.Icons.Library2;
@@ -62 +64 @@
   </ul>
 </html>"),
-    Icon(graphics={
+    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
+            100}}), graphics={
         Ellipse(extent={{-60,10},{40,-90}}, lineColor={0,0,255}), 
         Ellipse(
@@ -114 +117 @@
 </p>
 </dl>
-</html>"), Icon(graphics={
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={
           Rectangle(
             extent={{-80,-10},{60,-70}}, 
@@ -586 +590 @@
       extends Interfaces.TwoPlug;
       Modelica.Blocks.Interfaces.RealInput R[m] 
-        annotation (Placement(transformation(
-            origin={0,100}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{10,90},{-10,110}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.VariableResistor variableResistor[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -632 +634 @@
       extends Interfaces.TwoPlug;
       Modelica.Blocks.Interfaces.RealInput G[m] 
-        annotation (Placement(transformation(
-            origin={0,100}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{10,90},{-10,110}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.VariableConductor variableConductor[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -680 +680 @@
         "minimum Capacitance";
       Modelica.Blocks.Interfaces.RealInput C[m] 
-        annotation (Placement(transformation(
-            origin={0,100}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{10,90},{-10,110}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.VariableCapacitor variableCapacitor[m](final Cmin = Cmin) 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -726 +724 @@
         "minimum Inductance";
       Modelica.Blocks.Interfaces.RealInput L[m] 
-        annotation (Placement(transformation(
-            origin={0,100}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{10,90},{-10,110}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.VariableInductor variableInductor[m](final Lmin
           =    Lmin) 
@@ -810 +806 @@
 </p>
 </dl>
-</html>"), Icon(graphics={Ellipse(extent={{-60,12},{40,-88}}, lineColor={135,
-                135,135}), Polygon(
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={Ellipse(extent={{-60,12},{40,-88}}, 
+              lineColor={135,135,135}), Polygon(
             points={{-30,-10},{-30,-66},{28,-38},{-30,-10}}, 
             lineColor={135,135,135}, 
@@ -837 +834 @@
         V=fill(V, m),
         freqHz=fill(f, m),
-        m=m) annotation (Placement(transformation(
-            origin={-80,20}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=180)));
+        m=m) annotation (Placement(transformation(extent={{-70,30},{-90,10}}, 
+              rotation=-180)));
       Basic.Star StarS1(m=m) 
-        annotation (Placement(transformation(
-            origin={-90,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-80,-72},{-100,-52}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundS1 
         annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}, 
@@ -853 +846 @@
               rotation=0)));
       Basic.Star StarT1(m=m) 
-        annotation (Placement(transformation(
-            origin={-40,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-30,-72},{-50,-52}}, 
+              rotation=-90)));
       Basic.Star StarT2(m=m) 
-        annotation (Placement(transformation(
-            origin={-20,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-10,-72},{-30,-52}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundT2 
         annotation (Placement(transformation(extent={{-30,-100},{-10,-80}}, 
@@ -874 +863 @@
               =0)));
       Basic.Star StarL1(m=m) 
-        annotation (Placement(transformation(
-            origin={90,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{100,-72},{80,-52}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundT1 
         annotation (Placement(transformation(extent={{-50,-100},{-30,-80}}, 
@@ -929 +916 @@
         V=fill(V, m),
         freqHz=fill(f, m),
-        m=m) annotation (Placement(transformation(
-            origin={-80,20}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=180)));
+        m=m) annotation (Placement(transformation(extent={{-70,30},{-90,10}}, 
+              rotation=-180)));
       Basic.Star StarS1(m=m) 
-        annotation (Placement(transformation(
-            origin={-90,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-80,-72},{-100,-52}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundS1 
         annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}, 
@@ -945 +928 @@
               rotation=0)));
       Basic.Star StarT1(m=m) 
-        annotation (Placement(transformation(
-            origin={-40,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
-      Basic.Delta Delta1(m=m) annotation (Placement(transformation(
-            origin={50,10}, 
-            extent={{-10,10},{10,-10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-30,-72},{-50,-52}}, 
+              rotation=-90)));
+      Basic.Delta Delta1(m=m) annotation (Placement(transformation(extent={{60,
+                20},{40,0}}, rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundT1 
         annotation (Placement(transformation(extent={{-50,-100},{-30,-80}}, 
@@ -966 +945 @@
               =0)));
       Basic.Star StarL1(m=m) 
-        annotation (Placement(transformation(
-            origin={90,-62}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{100,-72},{80,-52}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundL1 
         annotation (Placement(transformation(extent={{80,-100},{100,-80}}, 
@@ -1023 +1000 @@
                 {-90,-10}}, rotation=0)));
       Basic.Star StarS(m=m) 
-        annotation (Placement(transformation(
-            origin={-90,-50}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{-80,-60},{-100,-40}}, 
+              rotation=-90)));
       Basic.Inductor L1(m=m, L=fill(L, m)) 
         annotation (Placement(transformation(extent={{-52,-10},{-32,10}}, 
               rotation=0)));
       Ideal.IdealDiode IdealDiode1(m=m) 
-        annotation (Placement(transformation(
-            origin={10,20}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=90)));
-      Basic.Star Star1(m=m) annotation (Placement(transformation(
-            origin={10,50}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=90)));
+        annotation (Placement(transformation(extent={{0,30},{20,10}}, rotation=
+                90)));
+      Basic.Star Star1(m=m) annotation (Placement(transformation(extent={{0,60},
+                {20,40}}, rotation=90)));
       Ideal.IdealDiode IdealDiode2(m=m) 
-        annotation (Placement(transformation(
-            origin={10,-20}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=90)));
-      Basic.Star Star2(m=m) annotation (Placement(transformation(
-            origin={10,-50}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{0,-10},{20,-30}}, 
+              rotation=90)));
+      Basic.Star Star2(m=m) annotation (Placement(transformation(extent={{20,
+                -60},{0,-40}}, rotation=-90)));
       Modelica.Electrical.Analog.Basic.Resistor RLoad(R=RL) 
-        annotation (Placement(transformation(
-            origin={50,0}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{60,-10},{40,10}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Capacitor Capacitor1(C=2*C) 
-        annotation (Placement(transformation(
-            origin={70,30}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{80,20},{60,40}}, rotation
+              =-90)));
       Modelica.Electrical.Analog.Basic.Capacitor Capacitor2(C=2*C) 
-        annotation (Placement(transformation(
-            origin={70,-30}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{80,-40},{60,-20}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Basic.Ground GroundDC 
         annotation (Placement(transformation(extent={{80,-80},{100,-60}}, 
@@ -1130 +1091 @@
 </p>
 </dl>
-</html>"), Icon(graphics={
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={
           Line(points={{-100,-40},{80,-40}}), 
           Polygon(
@@ -1147 +1109 @@
         "Treshold voltage";
       Modelica.Blocks.Interfaces.BooleanInput fire[m] 
-        annotation (Placement(transformation(
-            origin={70,110}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{90,90},{50,130}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Ideal.IdealThyristor idealThyristor[m](final Ron=
                Ron, final Goff=Goff, final Vknee=Vknee) annotation (Placement(
@@ -1195 +1155 @@
         "Treshold voltage";
       Modelica.Blocks.Interfaces.BooleanInput fire[m] 
-        annotation (Placement(transformation(
-            origin={70,110}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+        annotation (Placement(transformation(extent={{90,90},{50,130}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Ideal.IdealGTOThyristor idealGTOThyristor[m](
           final Ron=Ron, final Goff=Goff, final Vknee=Vknee) annotation (Placement(
@@ -1242 +1200 @@
       Modelica.Blocks.Interfaces.BooleanInput control[m] 
         "true => p--n2 connected, false => p--n1 connected" annotation (Placement(
-            transformation(
-            origin={0,80}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+            transformation(extent={{20,60},{-20,100}}, rotation=-90)));
       Interfaces.PositivePlug plug_p(final m=m) 
         annotation (Placement(transformation(extent={{-110,-10},{-90,10}}, 
@@ -1317 +1272 @@
       Modelica.Blocks.Interfaces.BooleanInput control[m] 
         "true => p1--n2, p2--n1 connected, otherwise p1--n1, p2--n2 connected" 
-            annotation (Placement(transformation(
-            origin={0,80}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+            annotation (Placement(transformation(extent={{20,60},{-20,100}}, 
+              rotation=-90)));
       Interfaces.PositivePlug plug_p1(final m=m) 
         annotation (Placement(transformation(extent={{-110,40},{-90,60}}, 
@@ -1575 +1528 @@
       Modelica.Blocks.Interfaces.BooleanInput control[m] 
         "true => switch open, false => p--n connected" annotation (Placement(
-            transformation(
-            origin={0,70}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+            transformation(extent={{20,50},{-20,90}}, rotation=-90)));
       Modelica.Electrical.Analog.Ideal.IdealOpeningSwitch idealOpeningSwitch[m](final Ron=Ron,
            final Goff=Goff) annotation (Placement(transformation(extent={{-10,
@@ -1629 +1579 @@
       Modelica.Blocks.Interfaces.BooleanInput control[m] 
         "true => p--n connected, false => switch open" annotation (Placement(
-            transformation(
-            origin={0,70}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+            transformation(extent={{20,50},{-20,90}}, rotation=-90)));
       Modelica.Electrical.Analog.Ideal.IdealClosingSwitch idealClosingSwitch[m](final Ron=Ron,
            final Goff=Goff) annotation (Placement(transformation(extent={{-10,
@@ -1712 +1659 @@
 </p>
 </dl>
-</html>"), Icon(graphics={
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={
           Ellipse(extent={{-60,10},{40,-90}}, lineColor={0,0,255}), 
           Ellipse(
@@ -1917 +1865 @@
 </p>
 </dl>
-</html>"), Icon(graphics={
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={
           Ellipse(
             extent={{-60,10},{40,-90}}, 
@@ -1958 +1907 @@
       extends Modelica.Icons.RotationalSensor;
       parameter Integer m(final min=1) = 3 "number of phases";
-      Interfaces.PositivePlug plug_p(m) annotation (Placement(transformation(
+      Interfaces.PositivePlug plug_p(final m=m) 
+                                        annotation (Placement(transformation(
               extent={{-110,-10},{-90,10}}, rotation=0)));
       Modelica.Blocks.Interfaces.RealOutput phi[m] 
@@ -2003 +1953 @@
       Modelica.Blocks.Interfaces.RealOutput v[m] 
         "Voltage between pin p and n (= p.v - n.v) as output signal" 
-         annotation (Placement(transformation(
-            origin={0,-110}, 
-            extent={{10,-10},{-10,10}}, 
-            rotation=90)));
+         annotation (Placement(transformation(extent={{10,-100},{-10,-120}}, 
+              rotation=90)));
       Modelica.Electrical.Analog.Sensors.VoltageSensor voltageSensor[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -2061 +2009 @@
       Modelica.Blocks.Interfaces.RealOutput i[m] 
         "current in the branch from p to n as output signal" 
-         annotation (Placement(transformation(
-            origin={0,-110}, 
-            extent={{10,-10},{-10,10}}, 
-            rotation=90)));
+         annotation (Placement(transformation(extent={{10,-100},{-10,-120}}, 
+              rotation=90)));
       Modelica.Electrical.Analog.Sensors.CurrentSensor currentSensor[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -2174 +2120 @@
               rotation=0)));
     Modelica.Blocks.Interfaces.RealOutput power 
-      annotation (Placement(transformation(
-            origin={-80,-110}, 
-            extent={{10,-10},{-10,10}}, 
-            rotation=90)));
+      annotation (Placement(transformation(extent={{-70,-100},{-90,-120}}, 
+              rotation=90)));
     Modelica.Electrical.MultiPhase.Sensors.VoltageSensor voltageSensor(final m=m) 
-      annotation (Placement(transformation(
-            origin={0,-20}, 
-            extent={{10,-10},{-10,10}}, 
-            rotation=90)));
+      annotation (Placement(transformation(extent={{10,-30},{-10,-10}}, 
+              rotation=90)));
     Modelica.Electrical.MultiPhase.Sensors.CurrentSensor currentSensor(final m=m) 
       annotation (Placement(transformation(extent={{-50,-10},{-30,10}}, 
               rotation=0)));
     Modelica.Blocks.Math.Product product[m] 
-      annotation (Placement(transformation(
-            origin={-30,-40}, 
-            extent={{-10,-10},{10,10}}, 
-            rotation=270)));
+      annotation (Placement(transformation(extent={{-20,-50},{-40,-30}}, 
+              rotation=270)));
     Modelica.Blocks.Math.Sum sum(final nin=m, final k=ones(m)) 
-      annotation (Placement(transformation(
-            origin={-30,-70}, 
-            extent={{10,-10},{-10,10}}, 
-            rotation=90)));
+      annotation (Placement(transformation(extent={{-20,-60},{-40,-80}}, 
+              rotation=90)));
   equation 
     connect(pc, currentSensor.plug_p) annotation (Line(points={{-100,0},{-50,0}}, 
@@ -2256 +2194 @@
 </p>
 </dl>
-</html>"), Icon(graphics={
+</html>"), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+              {100,100}}), graphics={
           Line(points={{-100,-40},{-60,-40}}), 
           Line(points={{-60,-40},{40,-40}}), 
@@ -2275 +2214 @@
       Modelica.Blocks.Interfaces.RealInput v[m] 
         "Voltage between pin p and n (= p.v - n.v) as input signal" 
-         annotation (Placement(transformation(
-            origin={0,70}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+         annotation (Placement(transformation(extent={{20,50},{-20,90}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}}, 
@@ -2458 +2395 @@
       Modelica.Blocks.Interfaces.RealInput i[m] 
         "Current flowing from pin p to pin n as input signal" 
-         annotation (Placement(transformation(
-            origin={0,70}, 
-            extent={{-20,-20},{20,20}}, 
-            rotation=270)));
+         annotation (Placement(transformation(extent={{20,50},{-20,90}}, 
+              rotation=-90)));
       Modelica.Electrical.Analog.Sources.SignalCurrent signalCurrent[m] 
         annotation (Placement(transformation(extent={{-10,-10},{10,10}},