Changeset 732

Show
Ignore:
Timestamp:
10/25/07 12:43:36 (13 months ago)
Author:
otter
Message:

Changed "r/min" back to the original "rev/min", since a simple unit check
in connecors (whether unit strings are identical) will result in an error
with this change, if user models used "rev/min" already.

Location:
Modelica/branches/maintenance/2.2.2/Modelica
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • Modelica/branches/maintenance/2.2.2/Modelica/Blocks/Math.mo

    r658 r732  
    236236    block To_rpm "Convert from radian per second to revolutions per minute"  
    237237      extends Modelica.Blocks.Interfaces.PartialConversionBlock(u(unit="rad/s"), 
    238           y(unit="r/min")); 
     238          y(unit="rev/min")); 
    239239      annotation (Icon(Text( 
    240240            extent=[26,82; -98,50], 
    … …  
    243243            extent=[100,-42; -62,-74], 
    244244            style(color=0), 
    245             string="r/min")), Documentation(info="<html> 
     245            string="rev/min")), Documentation(info="<html> 
    246246<p> 
    247247This block converts the input signal from radian per second to revolutions per minute and returns 
    … …  
    255255    block From_rpm "Convert from revolutions per minute to radian per second"  
    256256      extends Modelica.Blocks.Interfaces.PartialConversionBlock(u(unit= 
    257               "r/min"), y(unit="rad/s")); 
     257              "rev/min"), y(unit="rad/s")); 
    258258      annotation (Icon(Text( 
    259259            extent=[50,84; -94,56], 
    260260            style(color=0), 
    261             string="r/min"), Text( 
     261            string="rev/min"), Text( 
    262262            extent=[94,-42; -26,-74], 
    263263            style(color=0), 

  • Modelica/branches/maintenance/2.2.2/Modelica/SIunits.mo

    r675 r732  
    397397        "Angle in degree"; 
    398398      type AngularVelocity_rpm = Real (final quantity="AngularVelocity", final unit 
    399             =    "r/min") "Angular velocity in revolutions per minute"; 
     399            =    "rev/min") "Angular velocity in revolutions per minute"; 
    400400      type Velocity_kmh = Real (final quantity="Velocity", final unit="km/h")  
    401401        "Velocity in kilometers per hour"; 
    … …  
    436436"), Icon(Text( 
    437437            extent=[-66, -13; 52, -67], 
    438             string="[r/min]", 
     438            string="[rev/min]", 
    439439            style(color=0)))); 
    440440    end NonSIunits; 
    … …  
    570570            extent=[100, -20; 20, -100], 
    571571            style(color=0), 
    572             string="r/min"))); 
     572            string="rev/min"))); 
    573573    algorithm  
    574574      rpm := (30/Modelica.Constants.pi)*rs; 
    … …  
    583583            extent=[-20, 100; -100, 20], 
    584584            style(color=0), 
    585             string="r/min"), Text( 
     585            string="rev/min"), Text( 
    586586            extent=[100, -20; 20, -100], 
    587587            style(color=0), 
    … …  
    864864      final quantity="AngularVelocity", 
    865865      final unit="rad/s", 
    866       displayUnit="r/min"); 
     866      displayUnit="rev/min"); 
    867867  type AngularAcceleration = Real (final quantity="AngularAcceleration", final unit 
    868868        =    "rad/s2");