Changeset 532

Show
Ignore:
Timestamp:
08/13/07 19:43:00 (16 months ago)
Author:
AHaumer
Message:

improved documentation

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r515 r532  
    22  extends Modelica.Icons.Library2; 
    33  annotation ( 
    4   version="1.7.6", versionDate="2007-06-26", 
     4  version="1.7.7", versionDate="2007-08-12", 
    55  Settings(NewStateSelection=true, Evaluate=true), 
    66  preferedView="info", Documentation(info="<HTML> 
    … …  
    102102  <li> v1.7.1 2006/02/06 Anton Haumer<br> 
    103103       changed some naming of synchronous machines, not affecting existing models</li> 
    104   <li> v1.7.3 /01/18 Anton Haumer<br> 
     104  <li> v1.7.3 2007/01/18 Anton Haumer<br> 
    105105       resolved a bug in electrical excitation of synchronous induction machine</li> 
    106106  <li> v1.7.4 2007/06/08 Anton Haumer<br> 
    … …  
    110110  <li> v1.7.6 2007/06/26 Anton Haumer<br> 
    111111       consistent parameters of DCSE</li> 
     112  <li> v1.7.7 2007/08/12 Anton Haumer<br> 
     113       Changed QuadraticLoadTorque1(TorqueDirection=true) to QuadraticLoadTorque1(TorqueDirection=false) since more realistic<br> 
     114       improved documentation</li> 
    112115  </ul> 
    113116</HTML>"), 
    … …  
    242245        QuadraticLoadTorque1( 
    243246                    w_nominal=Modelica.SIunits.Conversions.from_rpm(rpmLoad), 
    244           tau_nominal=-T_Load)  
     247          tau_nominal=-T_Load, 
     248        TorqueDirection=false)  
    245249        annotation (extent=[90,-50; 70,-30]); 
    246250      Utilities.TerminalBox TerminalBox1(StarDelta="D")  
    … …  
    350354        QuadraticLoadTorque1( 
    351355                    w_nominal=Modelica.SIunits.Conversions.from_rpm(rpmLoad), 
    352           tau_nominal=-T_Load)  
     356          tau_nominal=-T_Load, 
     357        TorqueDirection=false)  
    353358        annotation (extent=[90,-50; 70,-30]); 
    354359    equation  
    … …  
    463468        QuadraticLoadTorque1( 
    464469                    w_nominal=Modelica.SIunits.Conversions.from_rpm(rpmLoad), 
    465           tau_nominal=-T_Load)  
     470          tau_nominal=-T_Load, 
     471        TorqueDirection=false)  
    466472        annotation (extent=[90,-50; 70,-30]); 
    467473      Utilities.TerminalBox TerminalBox1(StarDelta="D")  
    … …  
    11311137        QuadraticLoadTorque1( 
    11321138        w_nominal=Modelica.SIunits.Conversions.from_rpm(rpmLoad), 
    1133         tau_nominal=-T_Load)  
     1139        tau_nominal=-T_Load, 
     1140        TorqueDirection=false)  
    11341141        annotation (extent=[90,-50; 70,-30]); 
    11351142    equation  
    … …  
    12861293      model TerminalBox  
    12871294        constant Integer m=3 "number of phases"; 
    1288         parameter String StarDelta="Y"  
     1295        parameter String StarDelta="Y" "Choose Y=star/D=delta"  
    12891296          annotation(choices(choice="Y" "Star connection",choice="D"  
    12901297              "Delta connection")); 
    … …  
    36683675            fillPattern=1)))); 
    36693676     
    3670     model VoltageRMSsensor  
    3671       constant Integer m(final min=1) = 3 "number of phases"; 
     3677    model VoltageRMSsensor "Length of spcae phasor -> RMS voltage"  
     3678      constant Integer m(final min=1) = 3 "Number of phases"; 
    36723679      Modelica.Blocks.Interfaces.RealOutput V(redeclare type SignalType =  
    36733680            Modelica.SIunits.Voltage)  
    … …  
    37233730            22; -7.34764e-016,22], 
    37243731                               style(color=3, rgbcolor={0,0,255})); 
    3725       connect(ToSpacePhasor1.y, ToPolar1.u) annotation (points=[6.73533e-016,-1; 
     3732      connect(ToSpacePhasor1.y, ToPolar1.u) annotation (points=[6.73533e-016,-1;  
    37263733            6.73533e-016,-8.5; -7.34764e-016,-8.5; -7.34764e-016,-18], style(color= 
    37273734              3, rgbcolor={0,0,255})); 
    3728       connect(ToPolar1.y[1], Gain1.u) annotation (points=[-0.5,-41; -0.5,-49.5; 
     3735      connect(ToPolar1.y[1], Gain1.u) annotation (points=[-0.5,-41; -0.5,-49.5;  
    37293736            -7.34764e-016,-49.5; -7.34764e-016,-58], style(color=3, rgbcolor={0,0, 
    37303737              255})); 
    … …  
    37343741    end VoltageRMSsensor; 
    37353742     
    3736     model CurrentRMSsensor  
    3737       constant Integer m(final min=1) = 3 "number of phases"; 
     3743    model CurrentRMSsensor "Length of spcae phasor -> RMS current"  
     3744      constant Integer m(final min=1) = 3 "Number of phases"; 
    37383745      Modelica.Blocks.Interfaces.RealOutput I(redeclare type SignalType =  
    37393746            Modelica.SIunits.Current)  
    … …  
    37893796            22; -7.34764e-016,22], 
    37903797                               style(color=3, rgbcolor={0,0,255})); 
    3791       connect(ToSpacePhasor1.y, ToPolar1.u) annotation (points=[6.73533e-016,-1; 
     3798      connect(ToSpacePhasor1.y, ToPolar1.u) annotation (points=[6.73533e-016,-1;  
    37923799            6.73533e-016,-8.5; -7.34764e-016,-8.5; -7.34764e-016,-18], style(color= 
    37933800              3, rgbcolor={0,0,255})); 
    3794       connect(ToPolar1.y[1], Gain1.u) annotation (points=[-0.5,-41; -0.5,-49.5; 
     3801      connect(ToPolar1.y[1], Gain1.u) annotation (points=[-0.5,-41; -0.5,-49.5;  
    37953802            -7.34764e-016,-49.5; -7.34764e-016,-58], style(color=3, rgbcolor={0,0, 
    37963803              255})); 
    … …  
    38003807    end CurrentRMSsensor; 
    38013808     
    3802     model ElectricalPowerSensor  
    3803       constant Integer m(final min=1) = 3 "number of phases"; 
     3809    model ElectricalPowerSensor "Instantaneous power from spcae phasors"  
     3810      constant Integer m(final min=1) = 3 "Number of phases"; 
    38043811      Modelica.Blocks.Interfaces.RealOutput P(redeclare type SignalType =  
    38053812            Modelica.SIunits.Power)  
    … …  
    38623869    end ElectricalPowerSensor; 
    38633870     
    3864     model MechanicalPowerSensor  
     3871    model MechanicalPowerSensor "Mechanical power = torque x speed"  
    38653872      extends Modelica.Mechanics.Rotational.Interfaces.TwoFlanges; 
    38663873      Modelica.Blocks.Interfaces.RealOutput P(redeclare type SignalType =  
    … …  
    39073914      connect(SpeedSensor1.flange_a, flange_a)  
    39083915        annotation (points=[-30,0; -100,0], style(color=0, rgbcolor={0,0,0})); 
    3909       connect(SpeedSensor1.w, Product1.u2) annotation (points=[-30,-21; -30,-40; 
     3916      connect(SpeedSensor1.w, Product1.u2) annotation (points=[-30,-21; -30,-40;  
    39103917            -6,-40; -6,-58], style(color=3, rgbcolor={0,0,255})); 
    39113918      connect(TorqueSensor1.tau, Product1.u1) annotation (points=[22,-11; 22,