Changeset 772

Timestamp:

11/07/07 18:40:52 (13 months ago)

Author:

AHaumer

Message:

fixed a minor bug in Examples

Files:

• Modelica/branches/maintenance/2.2.1/Modelica/Electrical/Machines.mo (modified) (15 diffs)

Modelica/branches/maintenance/2.2.1/Modelica/Electrical/Machines.mo

@@ -481 +481 @@
         annotation (points=[-70, 90; -80, 90], style(color=3));
       connect(SineVoltage1.plug_n, Star1.plug_p) 
-        annotation (points=[-6.12303e-016,70; -6.12303e-016,90; -50,90],
+        annotation (points=[-6.12323e-016,70; -6.12323e-016,90; -50,90],
                                                         style(color=3));
       connect(SineVoltage1.plug_p, IdealCloser1.plug_p) 
-        annotation (points=[6.12303e-016,50; 0,48; 1.22461e-015,46;
-            6.12303e-016,46; 6.12303e-016,40], style(color=3));
+        annotation (points=[6.12323e-016,50; 0,48; 1.22461e-015,46; 
+            6.12323e-016,46; 6.12323e-016,40], style(color=3));
       connect(Star3.pin_n, Ground3.p) 
         annotation (points=[-70,-90; -80,-90],   style(color=3));
@@ -522 +522 @@
             -59,-40; -48,-40], style(color=5, rgbcolor={255,0,255}));
       connect(IdealCloser1.plug_n, CurrentRMSsensor1.plug_p) annotation (points=[
-            -6.12303e-016,20; -6.12303e-016,16; 6.12303e-016,16; 6.12303e-016,
+            -6.12323e-016,20; -6.12323e-016,16; 6.12323e-016,16; 6.12323e-016,
             10], style(
           color=3,
@@ -544 +544 @@
           fillPattern=1));
       connect(TerminalBox1.plugToGrid, CurrentRMSsensor1.plug_n) annotation (
-          points=[-10,-28; -10,-20; -6.12303e-016,-20; -6.12303e-016,-10],
+          points=[-10,-28; -10,-20; -6.12323e-016,-20; -6.12323e-016,-10],
           style(
           color=3,
@@ -704 +704 @@
     equation 
       connect(SignalVoltage1.plug_n, Star1.plug_p) 
-        annotation (points=[-6.12303e-016,70; -6.12303e-016,90; -50,90],
+        annotation (points=[-6.12323e-016,70; -6.12323e-016,90; -50,90],
                                                         style(color=3));
       connect(Star1.pin_n, Ground1.p) 
@@ -717 +717 @@
         annotation (points=[60,-40; 70,-40], style(color=0, rgbcolor={0,0,0}));
       connect(CurrentRMSsensor1.plug_p, SignalVoltage1.plug_p) annotation (
-          points=[6.12303e-016,40; 6.12303e-016,42.5; 6.12303e-016,42.5;
-            6.12303e-016,45; 6.12303e-016,50; 6.12303e-016,50], style(color=3,
+          points=[6.12323e-016,40; 6.12323e-016,42.5; 6.12303e-016,42.5; 
+            6.12303e-016,45; 6.12303e-016,50; 6.12323e-016,50], style(color=3,
             rgbcolor={0,0,255}));
       connect(SMR1.plug_sn, RotorAngle1.plug_n)  annotation (points=[-16,-30;
             -16,-20], style(color=3, rgbcolor={0,0,255}));
       connect(SMR1.plug_sp, RotorAngle1.plug_p)  annotation (points=[-4,-30; -4,
-            -25; -4,-20; -4,-20], style(color=3, rgbcolor={0,0,255}));
+            -20],                 style(color=3, rgbcolor={0,0,255}));
       connect(SMR1.flange_a, RotorAngle1.flange) 
         annotation (points=[0,-40; 0,-10], style(color=0, rgbcolor={0,0,0}));
@@ -741 +741 @@
           fillPattern=1));
       connect(TerminalBox1.plugToGrid, CurrentRMSsensor1.plug_n) annotation (
-          points=[-10,-28; 12,-28; 12,20; -6.12303e-016,20], style(
+          points=[-10,-28; 12,-28; 12,20; -6.12323e-016,20], style(
           color=3,
           rgbcolor={0,0,255},
@@ -811 +811 @@
     equation 
       connect(SignalVoltage1.plug_n, Star1.plug_p) 
-        annotation (points=[-6.12303e-016,70; -6.12303e-016,90; -50,90],
+        annotation (points=[-6.12323e-016,70; -6.12323e-016,90; -50,90],
                                                         style(color=3));
       connect(Star1.pin_n, Ground1.p) 
@@ -822 +822 @@
         annotation (points=[60,-40; 70,-40], style(color=0, rgbcolor={0,0,0}));
       connect(SignalVoltage1.plug_p, CurrentRMSsensor1.plug_p) annotation (points=[
-            6.12303e-016,50; 0,50; 0,40; 6.12303e-016,40], style(color=3,
+            6.12323e-016,50; 0,50; 0,40; 6.12323e-016,40], style(color=3,
             rgbcolor={0,0,255}));
       connect(RotorAngle1.plug_n, SMPM1.plug_sn)  annotation (points=[-16,-20;
             -16,-30], style(color=3, rgbcolor={0,0,255}));
-      connect(RotorAngle1.plug_p, SMPM1.plug_sp)  annotation (points=[-4,-20;
-            -4,-25; -4,-25; -4,-30], style(color=3, rgbcolor={0,0,255}));
+      connect(RotorAngle1.plug_p, SMPM1.plug_sp)  annotation (points=[-4,-20; 
+            -4,-30],                 style(color=3, rgbcolor={0,0,255}));
       connect(RotorAngle1.flange, SMPM1.flange_a) 
         annotation (points=[0,-10; 0,-40], style(color=0, rgbcolor={0,0,0}));
@@ -847 +847 @@
           fillPattern=1));
       connect(TerminalBox1.plugToGrid, CurrentRMSsensor1.plug_n) annotation (
-          points=[-10,-28; 12,-28; 12,20; -6.12303e-016,20], style(
+          points=[-10,-28; 12,-28; 12,20; -6.12323e-016,20], style(
           color=3,
           rgbcolor={0,0,255},
@@ -889 +889 @@
 </HTML>"));
       Machines.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcitedDamperCage
-        SMEE1(phi_mechanical(start=-(Modelica.Constants.pi +
-              Modelica.SIunits.Conversions.from_deg(gamma0))/SMEE1.p)) 
+        SMEE1(phi_mechanical(start=-(Modelica.Constants.pi + 
+              Modelica.SIunits.Conversions.from_deg(gamma0))/SMEE1.p, fixed=
+              true)) 
         annotation (extent=[-20,-50; 0,-30],     rotation=0);
       Machines.Sensors.RotorAngle RotorAngle1(p=SMEE1.p) 
@@ -923 +924 @@
       connect(RotorAngle1.plug_n, SMEE1.plug_sn)  annotation (points=[-16,-20;
             -16,-30], style(color=3, rgbcolor={0,0,255}));
-      connect(RotorAngle1.plug_p, SMEE1.plug_sp)  annotation (points=[-4,-20;
+      connect(RotorAngle1.plug_p, SMEE1.plug_sp)  annotation (points=[-4,-20; 
             -4,-25; -4,-25; -4,-30], style(color=3, rgbcolor={0,0,255}));
       connect(RotorAngle1.flange, SMEE1.flange_a) 
@@ -932 +933 @@
             -40,90], style(color=3, rgbcolor={0,0,255}));
       connect(ElectricalPowerSensor1.plug_ni, CurrentRMSsensor1.plug_p) 
-        annotation (points=[6.12303e-016,50; 1.76911e-022,46; 6.12303e-016,46;
-            6.12303e-016,40], style(color=3, rgbcolor={0,0,255}));
+        annotation (points=[6.12323e-016,50; 1.76911e-022,46; 6.12323e-016,46; 
+            6.12323e-016,40], style(color=3, rgbcolor={0,0,255}));
       connect(SMEE1.flange_a, MechanicalPowerSensor1.flange_a) 
         annotation (points=[0,-40; 10,-40], style(color=0, rgbcolor={0,0,0}));
@@ -939 +940 @@
         annotation (points=[30,-40; 70,-40], style(color=0, rgbcolor={0,0,0}));
       connect(SineVoltage1.plug_p, ElectricalPowerSensor1.plug_p) annotation (
-          points=[-20,90; -6.12303e-016,90; -6.12303e-016,70], style(color=3,
+          points=[-20,90; -6.12323e-016,90; -6.12323e-016,70], style(color=3,
             rgbcolor={0,0,255}));
       connect(RampCurrent1.p, Ground3.p) annotation (points=[-50,-50; -80,-50],
@@ -962 +963 @@
           fillPattern=1));
       connect(TerminalBox1.plugToGrid, CurrentRMSsensor1.plug_n) annotation (
-          points=[-10,-28; 10,-28; 10,20; -6.12303e-016,20], style(
+          points=[-10,-28; 10,-28; 10,20; -6.12323e-016,20], style(
           color=3,
           rgbcolor={0,0,255},
@@ -2169 +2170 @@
         connect(spacePhasorS.plug_n, plug_sn) annotation (points=[-10,40; -10,
               60; -60,60; -60,100],     style(color=3, rgbcolor={0,0,255}));
-        connect(spacePhasorS.ground, spacePhasorS.zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground, spacePhasorS.zero) annotation (points=[-10,20;
               -10,14; -6.12303e-016,14; -6.12303e-016,20], style(
             color=3,