Changeset 1158
- Timestamp:
- 09/09/08 16:06:46 (2 months ago)
- Location:
- trunk
- Files:
-
- 9 modified
-
Modelica/Electrical/Digital.mo (modified) (1 diff)
-
Modelica/Mechanics/MultiBody/package.mo (modified) (3 diffs)
-
Modelica/Mechanics/Rotational.mo (modified) (167 diffs)
-
Modelica/Media/package.mo (modified) (3 diffs)
-
Modelica/SIunits.mo (modified) (3 diffs)
-
Modelica/StateGraph.mo (modified) (1 diff)
-
Modelica/Utilities/package.mo (modified) (1 diff)
-
Modelica/package.mo (modified) (1 diff)
-
ModelicaReference/package.mo (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modelica/Electrical/Digital.mo
r1155 r1158 4 4 package UsersGuide "User's Guide" 5 5 6 annotation ( DocumentationClass=true, Documentation(info="<html>6 annotation (__Dymola_DocumentationClass=true, Documentation(info="<html> 7 7 <p> 8 8 Library <b>Electrical.Digital</b> is a <b>free</b> Modelica package providing -
trunk/Modelica/Mechanics/MultiBody/package.mo
r1073 r1158 51 51 package UsersGuide "User's Guide of MultiBody Library" 52 52 53 annotation ( DocumentationClass=true, Documentation(info="<HTML>53 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 54 54 <p> 55 55 Library <b>MultiBody</b> is a <b>free</b> Modelica package providing … … 87 87 package Tutorial "Tutorial" 88 88 89 annotation ( DocumentationClass=true, Documentation(info="<HTML>89 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 90 90 <p> 91 91 This tutorial provides an introduction into the … … 331 331 class Introduction "Introduction" 332 332 333 annotation ( DocumentationClass=true, Documentation(info="<HTML>333 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 334 334 <p> 335 335 In principal, now special action is needed, if -
trunk/Modelica/Mechanics/Rotational.mo
r1120 r1158 8 8 version="1.1.1", versionDate="2007-11-22", 9 9 Documentation(info="<html> 10 10 11 11 <p> 12 12 Library <b>Rotational</b> is a <b>free</b> Modelica package providing … … 15 15 in the next figure: 16 16 </p> 17 17 18 18 <p><img src=\"../Images/Rotational/driveExample.png\"></p> 19 19 20 20 <p> 21 21 For an introduction, have especially a look at: … … 27 27 contains examples that demonstrate the usage of this library.</li> 28 28 </ul> 29 29 30 30 <p> 31 31 In version 3.0 of the Modelica Standard Library, the basic design of the … … 35 35 it must be connected, and if it is not enabled, it must not be connected. 36 36 </p> 37 37 38 38 <p> 39 39 Copyright © 1998-2008, Modelica Association and DLR. … … 42 42 <i>This Modelica package is <b>free</b> software; it can be redistributed and/or modified 43 43 under the terms of the <b>Modelica license</b>, see the license conditions 44 and the accompanying <b>disclaimer</b> 44 and the accompanying <b>disclaimer</b> 45 45 <a href=\"Modelica://Modelica.UsersGuide.ModelicaLicense\">here</a>.</i> 46 46 </p><br> … … 76 76 package UsersGuide "User's Guide of Rotational Library" 77 77 78 annotation ( DocumentationClass=true, Documentation(info="<HTML>78 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 79 79 <p> 80 80 Library <b>Rotational</b> is a <b>free</b> Modelica package providing … … 87 87 class Overview "Overview" 88 88 89 annotation ( DocumentationClass=true, Documentation(info="<HTML>90 89 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 90 91 91 <p> 92 92 This package contains components to model <b>1-dimensional rotational … … 143 143 <p><IMG SRC=\"../Images/Rotational/driveConnections1.png\" ALT=\"driveConnections1\"></p> 144 144 <p><IMG SRC=\"../Images/Rotational/driveConnections2.png\" ALT=\"driveConnections2\"></p> 145 145 146 146 </HTML>")); 147 147 … … 150 150 class FlangeConnectors "Flange Connectors" 151 151 152 annotation ( DocumentationClass=true, Documentation(info="<HTML>152 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 153 153 <p> 154 154 A flange is described by the connector class … … 177 177 class SupportTorques "Support Torques" 178 178 179 annotation ( DocumentationClass=true, Documentation(info="<HTML>180 179 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 180 181 181 <p>The following figure shows examples of components equipped with 182 182 a support flange (framed flange in the lower center), which can be used … … 189 189 <a href=\"Modelica://Modelica.Mechanics.Rotational.Examples.ElasticBearing\">ElasticBearing</a>). 190 190 </p> 191 191 192 192 <p><IMG SRC=\"../Images/Rotational/bearing.png\" ALT=\"bearing\"></p> 193 193 194 194 <p> 195 195 Depending on the setting of <b>useSupport</b>, the icon of the corresponding … … 197 197 For example, the two implementations in the following figure give 198 198 identical results.</p> 199 199 200 200 <p><IMG SRC=\"../Images/Rotational/bearing2.png\" ALT=\"bearing2\"></p> 201 201 202 202 </HTML>")); 203 203 … … 206 206 class SignConventions "Sign Conventions" 207 207 208 annotation ( DocumentationClass=true, Documentation(info="<HTML>209 208 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 209 210 210 <p> 211 211 The variables of a component of this library can be accessed in the … … 266 266 class UserDefinedComponents "User Defined Components" 267 267 268 annotation ( DocumentationClass=true, Documentation(info="<HTML>268 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 269 269 <p> 270 270 In this section some hints are given to define your own … … 397 397 class RequirementsForSimulationTool "Requirements for Simulation Tools" 398 398 399 annotation ( DocumentationClass=true, Documentation(info="<HTML>400 399 annotation (__Dymola_DocumentationClass=true, Documentation(info="<HTML> 400 401 401 <p> 402 402 This library is designed in a fully object oriented way in order that … … 448 448 as possible. 449 449 </p> 450 450 451 451 </HTML>")); 452 452 … … 460 460 <dd><a href=\"http://www.robotic.dlr.de/Martin.Otter/\">Martin Otter</a> <br> 461 461 Deutsches Zentrum für Luft und Raumfahrt e.V. (DLR)<br> 462 Institut für Robotik und Mechatronik (DLR-RM)<br> 462 Institut für Robotik und Mechatronik (DLR-RM)<br> 463 463 Abteilung Systemdynamik und Regelungstechnik<br> 464 464 Postfach 1116<br> … … 497 497 simulate them according to the provided description in the models. 498 498 </p> 499 499 500 500 </HTML> 501 501 ")); … … 524 524 <p>Simulate for 1 second and plot the following variables:<br> 525 525 angular velocities of inertias inertia2 and 3: inertia2.w, inertia3.w</p> 526 526 527 527 </html>"), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100, 528 528 -100},{100,100}}), … … 530 530 experiment); 531 531 532 Rotational.Components.Fixed fixed 532 Rotational.Components.Fixed fixed 533 533 annotation (Placement(transformation(extent={{38, 534 534 -48},{54,-32}}, rotation=0))); 535 Rotational.Sources.Torque torque(useSupport=true) 535 Rotational.Sources.Torque torque(useSupport=true) 536 536 annotation (Placement(transformation(extent={{-68,-8}, 537 537 {-52,8}}, rotation=0))); 538 Rotational.Components.Inertia inertia1( J=Jmotor) 538 Rotational.Components.Inertia inertia1( J=Jmotor) 539 539 annotation (Placement(transformation(extent={{-38,-8},{-22,8}}, 540 540 rotation=0))); 541 541 Rotational.Components.IdealGear idealGear( ratio=ratio, useSupport= 542 true) 542 true) 543 543 annotation (Placement(transformation(extent={{-8,-8},{8,8}}, rotation= 544 544 0))); 545 545 Rotational.Components.Inertia inertia2( J=2, 546 546 phi(fixed=true, start=0), 547 w(fixed=true)) 547 w(fixed=true)) 548 548 annotation (Placement(transformation(extent={{22,-8},{38,8}}, 549 549 rotation=0))); … … 551 551 phi_rel(fixed=true)) annotation (Placement(transformation( 552 552 extent={{52,-8},{68,8}}, rotation=0))); 553 Rotational.Components.Inertia inertia3( J=Jload, w(fixed=true)) 553 Rotational.Components.Inertia inertia3( J=Jload, w(fixed=true)) 554 554 annotation (Placement(transformation(extent={{82,-8},{98,8}}, 555 555 rotation=0))); 556 Rotational.Components.Damper damper( d=damping) 556 Rotational.Components.Damper damper( d=damping) 557 557 annotation (Placement(transformation( 558 558 origin={46,-22}, 559 559 extent={{-8,-8},{8,8}}, 560 560 rotation=270))); 561 Modelica.Blocks.Sources.Sine sine(amplitude=amplitude, freqHz=freqHz) 561 Modelica.Blocks.Sources.Sine sine(amplitude=amplitude, freqHz=freqHz) 562 562 annotation (Placement(transformation(extent={{-98,-8},{-82,8}}, 563 563 rotation=0))); 564 564 equation 565 connect(inertia1.flange_b, idealGear.flange_a) 565 connect(inertia1.flange_b, idealGear.flange_a) 566 566 annotation (Line(points={{-22,0},{-8,0}}, color={0,0,0})); 567 connect(idealGear.flange_b, inertia2.flange_a) 567 connect(idealGear.flange_b, inertia2.flange_a) 568 568 annotation (Line(points={{8,0},{22,0}}, color={0,0,0})); 569 connect(inertia2.flange_b, spring.flange_a) 569 connect(inertia2.flange_b, spring.flange_a) 570 570 annotation (Line(points={{38,0},{52,0}}, color={0,0,0})); 571 connect(spring.flange_b, inertia3.flange_a) 571 connect(spring.flange_b, inertia3.flange_a) 572 572 annotation (Line(points={{68,0},{82,0}}, color={0,0,0})); 573 connect(damper.flange_a, inertia2.flange_b) 573 connect(damper.flange_a, inertia2.flange_b) 574 574 annotation (Line(points={{46,-14},{46,0},{38,0}}, color={0,0,0})); 575 connect(damper.flange_b, fixed.flange) 575 connect(damper.flange_b, fixed.flange) 576 576 annotation (Line(points={{46,-30},{46,-40}}, color={0,0,0})); 577 577 connect(sine.y, torque.tau) annotation (Line(points={{-81.2,0},{-69.6,0}}, … … 612 612 <p>Simulate for 1 second and plot the following variables:<br> 613 613 angular velocities of inertias inertia2 and 3: inertia2.w, inertia3.w</p> 614 614 615 615 </HTML>"), Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100, 616 616 -100},{100,100}}), … … 618 618 experiment(StopTime=1)); 619 619 620 Rotational.Components.Fixed fixed 620 Rotational.Components.Fixed fixed 621 621 annotation (Placement(transformation(extent={{38,-48}, 622 622 {54,-32}}, rotation=0))); 623 Rotational.Sources.Torque torque(useSupport=false) 623 Rotational.Sources.Torque torque(useSupport=false) 624 624 annotation (Placement(transformation(extent={{-68,-8}, 625 625 {-52,8}}, rotation=0))); 626 Rotational.Components.Inertia inertia1( J=Jmotor) 626 Rotational.Components.Inertia inertia1( J=Jmotor) 627 627 annotation (Placement(transformation(extent={{-38,-8},{-22,8}}, 628 628 rotation=0))); 629 Rotational.Components.IdealGear idealGear(ratio=ratio, useSupport=false) 629 Rotational.Components.IdealGear idealGear(ratio=ratio, useSupport=false) 630 630 annotation (Placement(transformation(extent={{-8,-8},{8,8}}, rotation= 631 631 0))); 632 632 Rotational.Components.Inertia inertia2( J=2, 633 633 phi(fixed=true, start=0), 634 w(fixed=true)) 634 w(fixed=true)) 635 635 annotation (Placement(transformation(extent={{22,-8},{38,8}}, 636 636 rotation=0))); … … 638 638 phi_rel(fixed=true)) annotation (Placement(transformation( 639 639 extent={{52,-8},{68,8}}, rotation=0))); 640 Rotational.Components.Inertia inertia3( J=Jload, w(fixed=true)) 640 Rotational.Components.Inertia inertia3( J=Jload, w(fixed=true)) 641 641 annotation (Placement(transformation(extent={{82,-8},{98,8}}, 642 642 rotation=0))); 643 Rotational.Components.Damper damper( d=damping) 643 Rotational.Components.Damper damper( d=damping) 644 644 annotation (Placement(transformation( 645 645 origin={46,-22}, 646 646 extent={{-8,-8},{8,8}}, 647 647 rotation=270))); 648 Modelica.Blocks.Sources.Sine sine(amplitude=amplitude, freqHz=freqHz) 648 Modelica.Blocks.Sources.Sine sine(amplitude=amplitude, freqHz=freqHz) 649 649 annotation (Placement(transformation(extent={{-98,-8},{-82,8}}, 650 650 rotation=0))); 651 651 equation 652 connect(inertia1.flange_b, idealGear.flange_a) 652 connect(inertia1.flange_b, idealGear.flange_a) 653 653 annotation (Line(points={{-22,0},{-8,0}}, color={0,0,0})); 654 connect(idealGear.flange_b, inertia2.flange_a) 654 connect(idealGear.flange_b, inertia2.flange_a) 655 655 annotation (Line(points={{8,0},{22,0}}, color={0,0,0})); 656 connect(inertia2.flange_b, spring.flange_a) 656 connect(inertia2.flange_b, spring.flange_a) 657 657 annotation (Line(points={{38,0},{52,0}}, color={0,0,0})); 658 connect(spring.flange_b, inertia3.flange_a) 658 connect(spring.flange_b, inertia3.flange_a) 659 659 annotation (Line(points={{68,0},{82,0}}, color={0,0,0})); 660 connect(damper.flange_a, inertia2.flange_b) 660 connect(damper.flange_a, inertia2.flange_b) 661 661 annotation (Line(points={{46,-14},{46,0},{38,0}}, color={0,0,0})); 662 connect(damper.flange_b, fixed.flange) 662 connect(damper.flange_b, fixed.flange) 663 663 annotation (Line(points={{46,-30},{46,-40}}, color={0,0,0})); 664 664 connect(sine.y, torque.tau) annotation (Line(points={{-81.2,0},{-69.6,0}}, … … 699 699 <p>as well as the absolute angular velocities of the three inertia components 700 700 (inertia1.w, inertia2.w, inertia3.w).</p> 701 701 702 702 </HTML>"), Diagram(coordinateSystem( 703 703 initialScale=0.1, … … 707 707 experiment(StopTime=3)); 708 708 709 Rotational.Sources.Torque torque(useSupport=true) 709 Rotational.Sources.Torque torque(useSupport=true) 710 710 annotation (Placement(transformation(extent={{-90,-10}, 711 711 {-70,10}}, rotation=0))); … … 718 718 w(start=100, 719 719 fixed=true, 720 displayUnit="rad/s")) 720 displayUnit="rad/s")) 721 721 annotation (Placement(transformation(extent={{-60,-10},{-40, 722 722 10}}, rotation=0))); 723 Rotational.Components.Clutch clutch( fn_max=160) 723 Rotational.Components.Clutch clutch( fn_max=160) 724 724 annotation (Placement(transformation( 725 725 extent={{-30,-10},{-10,10}}, … … 728 728 J=0.05, 729 729 phi(start=0, fixed=true), 730 w(start=90, fixed=true)) 730 w(start=90, fixed=true)) 731 731 annotation (Placement(transformation(extent={{0,-10},{20,10}}, 732 732 rotation=0))); 733 Rotational.Components.SpringDamper spring( c=160, d=1) 733 Rotational.Components.SpringDamper spring( c=160, d=1) 734 734 annotation (Placement(transformation(extent={{30,-10},{50,10}}, 735 735 rotation= … … 738 738 J=1, 739 739 phi(start=0, fixed=true), 740 w(start=90, fixed=true)) 740 w(start=90, fixed=true)) 741 741 annotation (Placement(transformation(extent={{90,-10},{110,10}}, 742 742 rotation=0))); 743 Rotational.Components.Brake brake( fn_max=1600, useSupport=true) 743 Rotational.Components.Brake brake( fn_max=1600, useSupport=true) 744 744 annotation (Placement(transformation( 745 745 extent={{60,-10},{80,10}}, 746 746 rotation=0))); 747 Modelica.Blocks.Sources.Constant const(k=1) 747 Modelica.Blocks.Sources.Constant const(k=1) 748 748 annotation (Placement(transformation( 749 749 origin={-25,35}, 750 750 extent={{-5,-5},{15,15}}, 751 751 rotation=270))); 752 Modelica.Blocks.Sources.Step step(startTime=startTime) 752 Modelica.Blocks.Sources.Step step(startTime=startTime) 753 753 annotation (Placement(transformation( 754 754 origin={65,35}, … … 760 760 startTime=startTime) annotation (Placement(transformation(extent={{-160, 761 761 -30},{-140,-10}}, rotation=0))); 762 Modelica.Blocks.Sources.Sine sine(amplitude=200, freqHz=50/pi) 762 Modelica.Blocks.Sources.Sine sine(amplitude=200, freqHz=50/pi) 763 763 annotation (Placement(transformation(extent={{-160,10},{-140,30}}, 764 764 rotation=0))); 765 Modelica.Blocks.Math.Product product 765 Modelica.Blocks.Math.Product product 766 766 annotation (Placement(transformation(extent={{-120,-10}, 767 767 {-100,10}}, 768 768 rotation=0))); 769 Rotational.Components.Fixed fixed 769 Rotational.Components.Fixed fixed 770 770 annotation (Placement(transformation(extent={{-10,-30}, 771 771 {10,-10}}, rotation=0))); … … 776 776 tSpring = spring.tau; 777 777 778 connect(torque.flange, inertia3.flange_a) 778 connect(torque.flange, inertia3.flange_a) 779 779 annotation (Line(points={{-70,0},{-70,0},{-60,0}}, 780 780 color={0,0,0})); 781 connect(inertia3.flange_b, clutch.flange_a) 781 connect(inertia3.flange_b, clutch.flange_a) 782 782 annotation (Line(points={{-40,0},{-30,0}},color={0,0,0})); 783 connect(clutch.flange_b, inertia2.flange_a) 783 connect(clutch.flange_b, inertia2.flange_a) 784 784 annotation (Line(points={{-10,0},{0,0}},color={0,0,0})); 785 connect(inertia2.flange_b, spring.flange_a) 785 connect(inertia2.flange_b, spring.flange_a) 786 786 annotation (Line(points={{20,0},{30,0}}, color={0,0,0})); 787 connect(spring.flange_b, brake.flange_a) 787 connect(spring.flange_b, brake.flange_a) 788 788 annotation (Line(points={{50,0},{60,0}}, color={0,0,0})); 789 connect(brake.flange_b, inertia1.flange_a) 789 connect(brake.flange_b, inertia1.flange_a) 790 790 annotation (Line(points={{80,0},{80,0},{90,0}}, 791 791 color={0,0,0})); … … 840 840 mode = -1/0/+1 means backward sliding, 841 841 locked, forward sliding.</p> 842 842 843 843 </HTML>"), __Dymola_Commands(file="Scripts/__Dymola_CoupledClutches.mos" 844 844 "Simulate and Plot"), … … 852 852 J=1, 853 853 phi(fixed=true, start=0), 854 w(start=10, fixed=true)) 854 w(start=10, fixed=true)) 855 855 annotation (Placement(transformation(extent={{-70,-10},{ 856 856 -50,10}}, 857 857 rotation=0))); 858 Rotational.Sources.Torque torque(useSupport=true) 858 Rotational.Sources.Torque torque(useSupport=true) 859 859 annotation (Placement(transformation(extent={{-100, 860 860 -10},{-80,10}}, rotation=0))); 861 Rotational.Components.Clutch clutch1( peak=1.1, fn_max=20) 861 Rotational.Components.Clutch clutch1( peak=1.1, fn_max=20) 862 862 annotation (Placement(transformation(extent={{-40,-10},{-20,10}}, 863 863 rotation=0))); 864 Modelica.Blocks.Sources.Sine sin1(amplitude=10, freqHz=5) 864 Modelica.Blocks.Sources.Sine sin1(amplitude=10, freqHz=5) 865 865 annotation (Placement(transformation(extent={{-130,-10},{-110,10}}, 866 866 rotation=0))); 867 Modelica.Blocks.Sources.Step step1(startTime=T2) 867 Modelica.Blocks.Sources.Step step1(startTime=T2) 868 868 annotation (Placement(transformation( 869 869 origin={25,35}, … … 874 874 w(fixed=true)) annotation (Placement(transformation(extent={{-10,-10}, 875 875 {10,10}}, rotation=0))); 876 Rotational.Components.Clutch clutch2( peak=1.1, fn_max=20) 876 Rotational.Components.Clutch clutch2( peak=1.1, fn_max=20) 877 877 annotation (Placement(transformation(extent={{20,-10},{40,10}}, 878 878 rotation= … … 882 882 w(fixed=true)) annotation (Placement(transformation(extent={{50,-10}, 883 883 {70,10}}, rotation=0))); 884 Rotational.Components.Clutch clutch3( peak=1.1, fn_max=20) 884 Rotational.Components.Clutch clutch3( peak=1.1, fn_max=20) 885 885 annotation (Placement(transformation(extent={{80,-10},{100,10}}, 886 886 rotation= … … 897 897 extent={{-5,-5},{15,15}}, 898 898 rotation=270))); 899 Modelica.Blocks.Sources.Step step2(startTime=T3) 899 Modelica.Blocks.Sources.Step step2(startTime=T3) 900 900 annotation (Placement(transformation( 901 901 origin={85,35}, 902 902 extent={{-5,-5},{15,15}}, 903 903 rotation=270))); 904 Rotational.Components.Fixed fixed 904 Rotational.Components.Fixed fixed 905 905 annotation (Placement(transformation(extent={{-100, 906 906 -30},{-80,-10}}, rotation=0))); 907 907 equation 908 connect(torque.flange, J1.flange_a) 908 connect(torque.flange, J1.flange_a) 909 909 annotation (Line(points={{-80,0},{-70,0}}, color={0,0,0})); 910 connect(J1.flange_b, clutch1.flange_a) 910 connect(J1.flange_b, clutch1.flange_a) 911 911 annotation (Line(points={{-50,0},{-40,0}}, color={0,0,0})); 912 connect(clutch1.flange_b, J2.flange_a) 912 connect(clutch1.flange_b, J2.flange_a) 913 913 annotation (Line(points={{-20,0},{-10,0}},color={0,0,0})); 914 connect(J2.flange_b, clutch2.flange_a) 914 connect(J2.flange_b, clutch2.flange_a) 915 915 annotation (Line(points={{10,0},{10,0},{20,0}}, 916 916 color={0,0,0})); 917 connect(clutch2.flange_b, J3.flange_a) 917 connect(clutch2.flange_b, J3.flange_a) 918 918 annotation (Line(points={{40,0},{50,0}}, color={0,0,0})); 919 connect(J3.flange_b, clutch3.flange_a) 919 connect(J3.flange_b, clutch3.flange_a) 920 920 annotation (Line(points={{70,0},{80,0}}, color={0,0,0})); 921 connect(clutch3.flange_b, J4.flange_a) 921 connect(clutch3.flange_b, J4.flange_a) 922 922 annotation (Line(points={{100,0},{110,0}}, 923 923 color={0,0,0})); … … 973 973 experiment(StopTime=0.5)); 974 974 Rotational.Components.LossyGear gear(ratio=2, lossTable=[0, 0.5, 0.5, 0, 0], 975 useSupport=true) 975 useSupport=true) 976 976 annotation (Pla
