Changeset 773 for branches/maintenance/2.2.2

Timestamp:

11/07/07 18:43:48 (11 months ago)

Author:

AHaumer

Message:

fixed a minor bug in Examples

Files:

• branches/maintenance/2.2.2/Modelica/Electrical/Machines.mo (modified) (18 diffs)

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

@@ -908 +908 @@
 </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) 
@@ -953 +954 @@
             -40,90], style(color=3, rgbcolor={0,0,255}));
       connect(ElectricalPowerSensor1.plug_ni, CurrentRMSsensor1.plug_p) 
-        annotation (points=[6.12323e-016,50; 1.76911e-022,46; 6.12323e-016,46;
+        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) 
@@ -2054 +2055 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(airGapS.spacePhasor_s, spacePhasorS.spacePhasor) annotation (points=[10,10; 
+        connect(airGapS.spacePhasor_s, spacePhasorS.spacePhasor) annotation (points=[10,10;
               10,20],        style(
             color=3,
@@ -2080 +2081 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60; 
+        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60;
               10,40], style(
             color=3,
@@ -2091 +2092 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20;
               -10,14; -6.12323e-016,14; -6.12323e-016,20],     style(
             color=3,
@@ -2295 +2296 @@
         connect(rr.plug_p, plug_rp)        annotation (points=[60,-80; 60,-90;
               -80,-90; -80,60; -100,60],  style(color=3, rgbcolor={0,0,255}));
-        connect(spacePhasorR.ground, spacePhasorR.zero) annotation (points=[-10,-20; 
+        connect(spacePhasorR.ground, spacePhasorR.zero) annotation (points=[-10,-20;
               -10,-14; -6.12323e-016,-14; -6.12323e-016,-20],      style(
             color=3,
@@ -2304 +2305 @@
         connect(airGapS.spacePhasor_r, spacePhasorR.spacePhasor) 
           annotation (points=[10,-10; 10,-20], style(color=3, rgbcolor={0,0,255}));
-        connect(spacePhasorS.spacePhasor, airGapS.spacePhasor_s) annotation (points=[10,20; 
+        connect(spacePhasorS.spacePhasor, airGapS.spacePhasor_s) annotation (points=[10,20;
               10,10],     style(
             color=3,
@@ -2331 +2332 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60; 
+        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60;
               10,40], style(
             color=3,
@@ -2342 +2343 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20;
               -10,14; -6.12323e-016,14; -6.12323e-016,20],     style(
             color=3,
@@ -2621 +2622 @@
           annotation (points=[10,-10; 20,-10; 20,-50; 10,-50], style(color=3,
               rgbcolor={0,0,255}));
-        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20; 
+        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20;
               10,10],        style(
             color=3,
@@ -2648 +2649 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60; 
+        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60;
               10,40], style(
             color=3,
@@ -2659 +2660 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20;
               -10,14; -6.12323e-016,14; -6.12323e-016,20],     style(
             color=3,
@@ -2917 +2918 @@
           annotation (points=[10,-10; 20,-10; 20,-50; 10,-50],
                                                style(color=3, rgbcolor={0,0,255}));
-        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20; 
+        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20;
               10,10],     style(
             color=3,
@@ -2944 +2945 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60; 
+        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60;
               10,40], style(
             color=3,
@@ -2955 +2956 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20;
               -10,14; -6.12323e-016,14; -6.12323e-016,20],     style(
             color=3,
@@ -3143 +3144 @@
         connect(airGapR.spacePhasor_r, damperCage.spacePhasor_r) 
           annotation (points=[10,-10; 10,-20], style(color=3, rgbcolor={0,0,255}));
-        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20; 
+        connect(spacePhasorS.spacePhasor, airGapR.spacePhasor_s) annotation (points=[10,20;
               10,10],     style(
             color=3,
@@ -3170 +3171 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60; 
+        connect(lssigma.plug_n,spacePhasorS. plug_p) annotation (points=[10,60;
               10,40], style(
             color=3,
@@ -3181 +3182 @@
             rgbcolor={0,0,255},
             smooth=0));
-        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20; 
+        connect(spacePhasorS.ground,spacePhasorS. zero) annotation (points=[-10,20;
               -10,14; -6.12323e-016,14; -6.12323e-016,20],     style(
             color=3,