-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #59 from tbeu/fix-dummy-annotations
Fix dummy annotations
- Loading branch information
Showing
33 changed files
with
583 additions
and
644 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| within PlanarMechanics.Examples; | ||
| model FreeBody "A simple free falling body" | ||
| extends Modelica.Icons.Example; | ||
|
|
||
| inner PlanarWorld planarWorld | ||
| annotation (Placement(transformation(extent={{-30,-10},{-10,10}}))); | ||
| Parts.Body body(m=1, I=0.1, | ||
| animate=true, | ||
| a(each fixed=false), | ||
| r(each fixed=true), | ||
| v(each fixed=true), | ||
| phi(fixed=true), | ||
| w(fixed=true)) | ||
| annotation (Placement(transformation(extent={{10,-10},{30,10}}))); | ||
| annotation ( | ||
| experiment(StopTime=3), | ||
| Documentation(revisions="<html> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p></html>", | ||
| info="<html> | ||
| <p>The gravity is defined in the planarWorld component</p> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/FreeBody_1.png\"/></p> | ||
| <p>The DAE has 73 scalar unknowns and 73 scalar equations.</p> | ||
| </html>")); | ||
| end FreeBody; | ||
| within PlanarMechanics.Examples; | ||
| model FreeBody "A simple free falling body" | ||
| extends Modelica.Icons.Example; | ||
|
|
||
| inner PlanarWorld planarWorld | ||
| annotation (Placement(transformation(extent={{-30,-10},{-10,10}}))); | ||
| Parts.Body body(m=1, I=0.1, | ||
| animate=true, | ||
| a(each fixed=false), | ||
| r(each fixed=true), | ||
| v(each fixed=true), | ||
| phi(fixed=true), | ||
| w(fixed=true)) | ||
| annotation (Placement(transformation(extent={{10,-10},{30,10}}))); | ||
| annotation ( | ||
| experiment(StopTime=3), | ||
| Documentation(revisions="<html> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p></html>", | ||
| info="<html> | ||
| <p>The gravity is defined in the planarWorld component</p> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/FreeBody_1.png\"/></p> | ||
| <p>The DAE has 73 scalar unknowns and 73 scalar equations.</p> | ||
| </html>")); | ||
| end FreeBody; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| within PlanarMechanics.GearComponents.Examples; | ||
| model PlanetaryGear "Rigid planetary gearbox" | ||
| extends Modelica.Icons.Example; | ||
|
|
||
| Utilities.RigidNoLossPlanetary planetary( | ||
| useHeatPort=true, | ||
| r_s=1, | ||
| r_p=1, | ||
| r_r=3, | ||
| J_s=1e-3, | ||
| J_p=1e-3, | ||
| J_c=1e-3, | ||
| J_r=1e-3) | ||
| annotation (Placement(transformation(extent={{0,0},{40,40}}))); | ||
| Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heatCapacitor(C=1) | ||
| annotation (Placement(transformation(extent={{-10,-10},{10,10}}, | ||
| rotation=90, | ||
| origin={-20,-30}))); | ||
| Modelica.Mechanics.Rotational.Sources.ConstantSpeed SunSpeed(w_fixed=1) | ||
| annotation (Placement(transformation(extent={{-50,0},{-30,20}}))); | ||
| Modelica.Mechanics.Rotational.Sources.ConstantTorque RingTorque(tau_constant= | ||
| 1) annotation (Placement(transformation(extent={{-50,30},{-30,50}}))); | ||
| equation | ||
| connect(heatCapacitor.port, planetary.heatPort) annotation (Line( | ||
| points={{-10,-30},{0,-30},{0,0}}, | ||
| color={191,0,0})); | ||
| connect(planetary.flange_Sun,SunSpeed. flange) annotation (Line( | ||
| points={{0,20},{-10,20},{-10,10},{-30,10}})); | ||
| connect(RingTorque.flange, planetary.flange_Ring) annotation (Line( | ||
| points={{-30,40},{-10,40},{-10,32},{0,32}})); | ||
| annotation (Documentation(info="<html> | ||
| <p>The model shows the possibilities of the gear connection models. | ||
| In this example only one of 3 planets is modelled. This reduction can be done because of the symmetry of the gears. For more advanced topics like load sharing between gears, more advanced models should be used.</p> | ||
| <p> | ||
| The ring gear is driven using a 1 Nm load, the velocity of the sun is fixed to 1 rad/s. | ||
| </p> | ||
| </html>", revisions= | ||
| "<html><p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p></html>"), | ||
| experiment(StopTime=10)); | ||
| end PlanetaryGear; | ||
| within PlanarMechanics.GearComponents.Examples; | ||
| model PlanetaryGear "Rigid planetary gearbox" | ||
| extends Modelica.Icons.Example; | ||
|
|
||
| Utilities.RigidNoLossPlanetary planetary( | ||
| useHeatPort=true, | ||
| r_s=1, | ||
| r_p=1, | ||
| r_r=3, | ||
| J_s=1e-3, | ||
| J_p=1e-3, | ||
| J_c=1e-3, | ||
| J_r=1e-3) | ||
| annotation (Placement(transformation(extent={{0,0},{40,40}}))); | ||
| Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heatCapacitor(C=1) | ||
| annotation (Placement(transformation(extent={{-10,-10},{10,10}}, | ||
| rotation=90, | ||
| origin={-20,-30}))); | ||
| Modelica.Mechanics.Rotational.Sources.ConstantSpeed SunSpeed(w_fixed=1) | ||
| annotation (Placement(transformation(extent={{-50,0},{-30,20}}))); | ||
| Modelica.Mechanics.Rotational.Sources.ConstantTorque RingTorque(tau_constant= | ||
| 1) annotation (Placement(transformation(extent={{-50,30},{-30,50}}))); | ||
| equation | ||
| connect(heatCapacitor.port, planetary.heatPort) annotation (Line( | ||
| points={{-10,-30},{0,-30},{0,0}}, | ||
| color={191,0,0})); | ||
| connect(planetary.flange_Sun,SunSpeed. flange) annotation (Line( | ||
| points={{0,20},{-10,20},{-10,10},{-30,10}})); | ||
| connect(RingTorque.flange, planetary.flange_Ring) annotation (Line( | ||
| points={{-30,40},{-10,40},{-10,32},{0,32}})); | ||
| annotation (Documentation(info="<html> | ||
| <p>The model shows the possibilities of the gear connection models. | ||
| In this example only one of 3 planets is modelled. This reduction can be done because of the symmetry of the gears. For more advanced topics like load sharing between gears, more advanced models should be used.</p> | ||
| <p> | ||
| The ring gear is driven using a 1 Nm load, the velocity of the sun is fixed to 1 rad/s. | ||
| </p> | ||
| </html>", revisions= | ||
| "<html><p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p></html>"), | ||
| experiment(StopTime=10)); | ||
| end PlanetaryGear; |
46 changes: 23 additions & 23 deletions
46
PlanarMechanics/GearComponents/Examples/Utilities/Interfaces/PlanetaryGearInterface.mo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| within PlanarMechanics.GearComponents.Examples.Utilities.Interfaces; | ||
| partial model PlanetaryGearInterface "Planetary gear interface" | ||
| extends PlanarMechanics.Utilities.Icons.PlanetaryGear; | ||
| extends Modelica.Thermal.HeatTransfer.Interfaces.PartialConditionalHeatPort; | ||
|
|
||
| Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_Ring | ||
| "Flange of shaft" | ||
| annotation (Placement(transformation(extent={{-110,50},{-90,70}}), | ||
| iconTransformation(extent={{-110,50},{-90,70}}))); | ||
| Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_Sun | ||
| "Flange of shaft" | ||
| annotation (Placement(transformation(extent={{-110,-10},{-90,10}}), | ||
| iconTransformation(extent={{-110,-10},{-90,10}}))); | ||
| Modelica.Mechanics.Rotational.Interfaces.Flange_a flange_Carrier | ||
| annotation ( | ||
| Placement(transformation(extent={{90,-10},{110,10}}),iconTransformation( | ||
| extent={{90,-10},{110,10}}))); | ||
| annotation (Documentation(revisions="<html> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p> | ||
| </html>", info="<html> | ||
| <p>This partial class contains common interfaces for a planetary gear model.</p> | ||
| </html>")); | ||
| end PlanetaryGearInterface; | ||
| within PlanarMechanics.GearComponents.Examples.Utilities.Interfaces; | ||
| partial model PlanetaryGearInterface "Planetary gear interface" | ||
| extends PlanarMechanics.Utilities.Icons.PlanetaryGear; | ||
| extends Modelica.Thermal.HeatTransfer.Interfaces.PartialConditionalHeatPort; | ||
|
|
||
| Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_Ring | ||
| "Flange of shaft" | ||
| annotation (Placement(transformation(extent={{-110,50},{-90,70}}), | ||
| iconTransformation(extent={{-110,50},{-90,70}}))); | ||
| Modelica.Mechanics.Rotational.Interfaces.Flange_b flange_Sun | ||
| "Flange of shaft" | ||
| annotation (Placement(transformation(extent={{-110,-10},{-90,10}}), | ||
| iconTransformation(extent={{-110,-10},{-90,10}}))); | ||
| Modelica.Mechanics.Rotational.Interfaces.Flange_a flange_Carrier | ||
| annotation ( | ||
| Placement(transformation(extent={{90,-10},{110,10}}),iconTransformation( | ||
| extent={{90,-10},{110,10}}))); | ||
| annotation (Documentation(revisions="<html> | ||
| <p><img src=\"modelica://PlanarMechanics/Resources/Images/dlr_logo.png\"/> <b>Developed 2010-2014 at the DLR Institute of System Dynamics and Control</b></p> | ||
| </html>", info="<html> | ||
| <p>This partial class contains common interfaces for a planetary gear model.</p> | ||
| </html>")); | ||
| end PlanetaryGearInterface; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| PlanetaryGear | ||
| SpurGear | ||
| Utilities | ||
| PlanetaryGear | ||
| SpurGear | ||
| Utilities |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.