Merge pull request #149 from dietmarw/removeDefaultAnnotations

Michael Tiller · Michael Tiller · commit 3a50421449e4 · 2014-05-09T10:45:38.000-04:00
Remove default annotations
diff --git a/ModelicaByExample/Architectures/SensorComparison/Examples/FlatSystem.mo b/ModelicaByExample/Architectures/SensorComparison/Examples/FlatSystem.mo
@@ -17,7 +17,7 @@ model FlatSystem "A rotational system with no architecture"
         extent={{-10,-10},{10,10}}, rotation=90, origin={70,0})));
   Modelica.Blocks.Math.Feedback feedback annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
-        rotation=0, origin={70,40})));
+        origin={70,40})));
   Modelica.Blocks.Sources.Trapezoid trapezoid(period=1.0)
     annotation (Placement(transformation(extent={{40,70},{60,90}})));
   Modelica.Blocks.Math.Gain gain(k=20) annotation (Placement(transformation(
diff --git a/ModelicaByExample/Architectures/SensorComparison/Examples/FlatSystem_Variation1.mo b/ModelicaByExample/Architectures/SensorComparison/Examples/FlatSystem_Variation1.mo
@@ -16,7 +16,7 @@ model FlatSystem_Variation1 "Variation containing a different sensor model"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}}, rotation=90, origin={70,0})));
   Modelica.Blocks.Math.Feedback feedback annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}}, rotation=0, origin={70,40})));
+        extent={{10,-10},{-10,10}}, origin={70,40})));
   Modelica.Blocks.Sources.Trapezoid trapezoid(period=1.0)
     annotation (Placement(transformation(extent={{40,70},{60,90}})));
   Modelica.Blocks.Math.Gain gain(k=20) annotation (Placement(transformation(
diff --git a/ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo b/ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
@@ -8,8 +8,7 @@ model IdealSensor "Implementation of an ideal sensor"
 protected
   Modelica.Mechanics.Rotational.Sensors.SpeedSensor idealSpeedSensor
     "An ideal speed sensor" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}}, rotation=0,
-        origin={0,0})));
+        extent={{-10,-10},{10,10}})));
 equation
   connect(idealSpeedSensor.flange, shaft) annotation (Line(
       points={{-10,0},{-100,0}},
diff --git a/ModelicaByExample/Architectures/SensorComparison/Implementation/PID_Controller.mo b/ModelicaByExample/Architectures/SensorComparison/Implementation/PID_Controller.mo
@@ -8,7 +8,7 @@ model PID_Controller "Controller subsystem implemented using a PID controller"
 protected
   Modelica.Blocks.Continuous.LimPID PID(k=k, Ti=Ti, Td=Td, yMax=yMax)
     annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}}, rotation=0, origin={0,0})));
+        extent={{10,-10},{-10,10}})));
 equation
   connect(setpoint, PID.u_s) annotation (Line(
       points={{0,120},{0,60},{40,60},{40,0},{12,0}},
diff --git a/ModelicaByExample/Architectures/SensorComparison/Implementation/ProportionalController.mo b/ModelicaByExample/Architectures/SensorComparison/Implementation/ProportionalController.mo
@@ -20,8 +20,7 @@ protected
         rotation=180, origin={-50,0})));
   Modelica.Blocks.Math.Feedback feedback
     annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0, origin={0,0})));
+        extent={{10,-10},{-10,10}})));
 equation
   connect(feedback.y, gain.u) annotation (Line(
       points={{-9,0},{2,0},{2,0},{-38,0}},
diff --git a/ModelicaByExample/Architectures/ThermalControl/Interfaces/Actuator.mo b/ModelicaByExample/Architectures/ThermalControl/Interfaces/Actuator.mo
@@ -4,7 +4,7 @@ partial model Actuator "Actuator subsystem interface"
   Modelica.Blocks.Interfaces.RealInput heat "Heating command" annotation (
       Placement(transformation(
         extent={{-20,-20},{20,20}},
-        rotation=0, origin={-120,0})));
+        origin={-120,0})));
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b furnace
     "Connection point for the furnace"
diff --git a/ModelicaByExample/Architectures/ThermalControl/Interfaces/Sensor.mo b/ModelicaByExample/Architectures/ThermalControl/Interfaces/Sensor.mo
@@ -6,6 +6,5 @@ partial model Sensor "Sensor subsystem interface"
   Modelica.Blocks.Interfaces.RealOutput temperature "Measured temperature"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0,
         origin={110,0})));
 end Sensor;
diff --git a/ModelicaByExample/Components/LotkaVolterra/Examples/ClassicLotkaVolterra.mo b/ModelicaByExample/Components/LotkaVolterra/Examples/ClassicLotkaVolterra.mo
@@ -6,7 +6,6 @@ model ClassicLotkaVolterra "Includes reproduction, starvation and predation"
   Components.Reproduction reproduction(alpha=0.1) "Reproduction of rabbits"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0,
         origin={-80,-30})));
   Components.RegionalPopulation foxes(init=ModelicaByExample.Components.LotkaVolterra.Components.RegionalPopulation.InitializationOptions.FixedPopulation,
       initial_population=10)
diff --git a/ModelicaByExample/Subsystems/HeatTransfer/Components/Rod.mo b/ModelicaByExample/Subsystems/HeatTransfer/Components/Rod.mo
@@ -23,7 +23,7 @@ protected
   HTC.HeatCapacitor capacitance[n](each final C=C/n, each T(start=T0, fixed=true))
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0, origin={-30,20})));
+        origin={-30,20})));
   HTC.ThermalConductor wall[n](each final G=G_wall/n)
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
diff --git a/ModelicaByExample/Subsystems/HeatTransfer/Examples/FlatRod.mo b/ModelicaByExample/Subsystems/HeatTransfer/Examples/FlatRod.mo
@@ -8,19 +8,19 @@ model FlatRod "Modeling a heat transfer in a rod in a without subsystems"
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor C1(C=0.1, T(fixed=true))
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0, origin={-60,2})));
+        origin={-60,2})));
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor G1(G=1.2)
     annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor C2(C=0.1, T(fixed=true))
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0, origin={0,2})));
+        origin={0,2})));
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor G2(G=1.2)
     annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
   Modelica.Thermal.HeatTransfer.Components.HeatCapacitor C3(C=0.1, T(fixed=true))
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0, origin={60,2})));
+        origin={60,2})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor sensor
     annotation (Placement(transformation(extent={{80,-30},{100,-10}})));
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor wall1(G=0.9)
diff --git a/ModelicaByExample/Subsystems/LotkaVolterra/Components/TwoSpecies.mo b/ModelicaByExample/Subsystems/LotkaVolterra/Components/TwoSpecies.mo
@@ -27,7 +27,6 @@ protected
   Reproduction reproduction(alpha=alpha) "Reproduction of rabbits"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        rotation=0,
         origin={-80,-50})));
   RegionalPopulation fox_population(
       init=RegionalPopulation.InitializationOptions.FixedPopulation,
diff --git a/text/source/components/architectures/sensor_comparison.rst b/text/source/components/architectures/sensor_comparison.rst
@@ -150,7 +150,7 @@ model:
 .. todo:: sentence is missing some text at the end
 
 Now, we want to create a variation of this model where the ``sensor``
-component 
+component
 
 Previously, we dealt with redundancy by using inheritance.  We can
 certainly use inheritance to pull the subsystems from
@@ -242,15 +242,15 @@ the ``IdealSensor`` model:
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
    :language: modelica
-   :lines: 1-12
+   :lines: 1-11
 
 The public interface of this component consists only of the two
 connectors ``w`` and ``shaft``.  Looking at the ``SampleHoldSensor``
 model:
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
    :language: modelica
-   :lines: 1-12
+   :lines: 1-11
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo
    :language: modelica
@@ -296,7 +296,7 @@ model without repeating ourselves as follows:
         redeclare Implementation.SampleHoldSensor sensor
       );
     end Variation3;
-    
+
 There are several things worth noting about this model.  The first is
 that the syntax of a redeclaration is just like a normal declaration
 except it is preceded by the ``redeclare`` keyword.  Also note that
@@ -424,4 +424,3 @@ top-down, :ref:`arch-driven-approach`.
 .. [ItPMwM] Michael M. Tiller, "Introduction to Physical Modeling with
 	    Modelica"
 	    http://www.amazon.com/Introduction-Physical-Modeling-International-Engineering/dp/0792373677
-
diff --git a/text/source/components/architectures/sensor_comparison_ad.rst b/text/source/components/architectures/sensor_comparison_ad.rst
@@ -179,7 +179,7 @@ Controller Models
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/ProportionalController.mo
    :language: modelica
-   :lines: 1-39,55
+   :lines: 1-38,54
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/PID_Controller.mo
    :language: modelica
@@ -190,7 +190,7 @@ Sensor Models
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
    :language: modelica
-   :lines: 1-23,42
+   :lines: 1-22,41
 
 .. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo
    :language: modelica
diff --git a/text/source/components/subsystems/population.rst b/text/source/components/subsystems/population.rst
@@ -18,7 +18,7 @@ dynamics.  The Modelica source code for the model is:
 
 .. literalinclude:: /ModelicaByExample/Subsystems/LotkaVolterra/Components/TwoSpecies.mo
    :language: modelica
-   :lines: 1-71,80
+   :lines: 1-70,79
 
 The diagram for this component is rendered as:
 
