Changeset 805

Show
Ignore:
Timestamp:
11/16/07 09:17:56 (11 months ago)
Author:
AHaumer
Message:

Examples adapted to changes in Rotational

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/Modelica/Blocks/package.mo

    r775 r805  
    117117      annotation (Placement(transformation(extent={{-56,-20},{-36,0}}, rotation= 
    118118             0))); 
    119     Modelica.Mechanics.Rotational.Inertia inertia1(a(fixed=true), phi(fixed= 
     119    Modelica.Mechanics.Rotational.Components.Inertia inertia1( 
     120                                                   a(fixed=true), phi(fixed= 
    120121            true, start=0))                   annotation (Placement( 
    121122          transformation(extent={{2,-20},{22,0}}, rotation=0))); 
     
    209210 
    210211</html>")); 
    211     Modelica.Mechanics.Rotational.Torque torque  
     212    Modelica.Mechanics.Rotational.Sources.Torque torque  
    212213      annotation (Placement(transformation(extent={{-25,-20},{-5,0}}, rotation= 
    213214              0))); 
    214     Modelica.Mechanics.Rotational.SpringDamper spring(c=1e4, d=100, 
     215    Modelica.Mechanics.Rotational.Components.SpringDamper spring( 
     216                                                      c=1e4, d=100, 
    215217      stateSelect=StateSelect.prefer, 
    216218      w_rel(fixed=true), 
    217219      a_rel(fixed=true))  
    218220      annotation (Placement(transformation(extent={{32,-20},{52,0}}, rotation=0))); 
    219     Modelica.Mechanics.Rotational.Inertia inertia2(J=2)  
     221    Modelica.Mechanics.Rotational.Components.Inertia inertia2( 
     222                                                   J=2)  
    220223      annotation (Placement(transformation(extent={{60,-20},{80,0}}, rotation=0))); 
    221224    Modelica.Blocks.Sources.KinematicPTP kinematicPTP(startTime=0.5, deltaq={ 
    222           driveAngle},  
    223       qd_max={1},  
     225          driveAngle}, 
     226      qd_max={1}, 
    224227      qdd_max={1})     annotation (Placement(transformation(extent={{-92,20},{ 
    225228              -72,40}}, rotation=0))); 
     
    230233      annotation (Placement(transformation(extent={{22,-50},{2,-30}}, rotation= 
    231234              0))); 
    232     Modelica.Mechanics.Rotational.ConstantTorque loadTorque(tau_constant=10)  
     235    Modelica.Mechanics.Rotational.Sources.ConstantTorque loadTorque( 
     236                                                            tau_constant=10)  
    233237      annotation (Placement(transformation(extent={{98,-15},{88,-5}}, rotation= 
    234238              0))); 
    235     Mechanics.Rotational.Fixed fixed  
     239    Modelica.Mechanics.Rotational.Components.Fixed fixed  
    236240      annotation (Placement(transformation(extent={{68,-35},{88,-15}}))); 
    237241  equation