Run ttws --strip Annex60 for #212

ibpsa · Apr 2, 2015 · 70fe571 · 70fe571
1 parent fc17588
commit 70fe571
Show file tree

Hide file tree

Showing 16 changed files with 123 additions and 123 deletions.
diff --git a/Annex60/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo b/Annex60/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
@@ -66,7 +66,7 @@ initial equation
 Documentation(info="<html>
 <p>
 Partial model for a two way valve. This is the base model for valves
-with different opening characteristics, such as linear, equal percentage, 
+with different opening characteristics, such as linear, equal percentage,
 quick opening or pressure-independent.
 </p>
 <p>
@@ -107,10 +107,10 @@ revisions="<html>
 <ul>
 <li>
 January 29, 2015, by Filip Jorissen:<br/>
-Moved the governing equations to 
+Moved the governing equations to
 <a href=\"modelica://Annex60.Fluid.Actuators.BaseClasses.PartialTwoWayValveKv\">
 PartialTwoWayValveKv</a>
-in order to be able to extend from this partial in 
+in order to be able to extend from this partial in
 <a href=\"modelica://Annex60.Fluid.Actuators.Valves.TwoWayPressureIndependent\">
 TwoWayPressureIndependent</a>
 </li>

diff --git a/Annex60/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo b/Annex60/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo
@@ -71,8 +71,8 @@ equation
           smooth=Smooth.None)}),
 Documentation(info="<html>
 <p>
-Partial model for valves with different opening characteristics, 
-such as linear, equal percentage or quick opening. This partial extends from 
+Partial model for valves with different opening characteristics,
+such as linear, equal percentage or quick opening. This partial extends from
 <a href=\"modelica://Annex60.Fluid.Actuators.BaseClasses.PartialTwoWayValve\">PartialTwoWayValve</a>
 and also contains the governing equations for these three two way valve models.
 </p>

diff --git a/Annex60/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo b/Annex60/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
@@ -111,58 +111,58 @@ equation
           smooth=Smooth.None)}),
 Documentation(info="<html>
 <p>
-Two way valve with a pressure-independent valve opening characteristic. 
-The mass flow rate is controlled such that it is nearly equal to its 
-set point <code>y*m_flow_nominal</code>, unless the pressure 
+Two way valve with a pressure-independent valve opening characteristic.
+The mass flow rate is controlled such that it is nearly equal to its
+set point <code>y*m_flow_nominal</code>, unless the pressure
 <code>dp</code> is too low, in which case a regular <code>Kv</code>
-characteristic is used. 
+characteristic is used.
 </p>
 <h4>Main equations</h4>
 <p>
-First the minimum pressure head <code>dp_min</code> 
-required for delivering the requested mass flow rate 
-<code>y*m_flow_nominal</code> is computed. If 
-<code>dp &gt; dp_min</code> then the requested mass flow 
-rate is supplied. If <code>dp &lt; dp_min</code> then 
-<code>m_flow = Kv/sqrt(dp)</code>. Transition between 
+First the minimum pressure head <code>dp_min</code>
+required for delivering the requested mass flow rate
+<code>y*m_flow_nominal</code> is computed. If
+<code>dp &gt; dp_min</code> then the requested mass flow
+rate is supplied. If <code>dp &lt; dp_min</code> then
+<code>m_flow = Kv/sqrt(dp)</code>. Transition between
 these two flow regimes happens in a smooth way.
 </p>
 <h4>Typical use and important parameters</h4>
 <p>
-This model is configured by setting <code>m_flow_nominal</code> 
-to the mass flow rate that the valve should supply when it is 
-completely open, i.e., <code>y = 1</code>. The pressure drop corresponding 
+This model is configured by setting <code>m_flow_nominal</code>
+to the mass flow rate that the valve should supply when it is
+completely open, i.e., <code>y = 1</code>. The pressure drop corresponding
 to this working point can be set using <code>dpValve_nominal</code>,
-or using a <code>Kv</code>, <code>Cv</code> or <code>Av</code> 
-value. The parameter <code>dpValve_fixed</code> can be used to add 
-additional pressure drops, although in this valve it is equivalent to 
-add these to <code>dpValve_nominal</code>. 
+or using a <code>Kv</code>, <code>Cv</code> or <code>Av</code>
+value. The parameter <code>dpValve_fixed</code> can be used to add
+additional pressure drops, although in this valve it is equivalent to
+add these to <code>dpValve_nominal</code>.
 </p>
 <p>
-The parameter <code>l2</code> represents the non-ideal 
-leakage behaviour of this valve for high pressures. 
-It is assumed that the mass flow rate will rise beyond 
+The parameter <code>l2</code> represents the non-ideal
+leakage behaviour of this valve for high pressures.
+It is assumed that the mass flow rate will rise beyond
 the requested mass flow rate <code>y*m_flow_nominal</code>
 if <code>dp &gt; dpValve_nominal+dpFixed_nominal</code>.
-The parameter <code>l2</code> represents the slope 
-of this rise: 
-<code>d(m_flow)/d(dp) = l2* m_flow_nominal/dp_nominal</code>. 
+The parameter <code>l2</code> represents the slope
+of this rise:
+<code>d(m_flow)/d(dp) = l2* m_flow_nominal/dp_nominal</code>.
 In the ideal case <code>l2=0</code>, but
-this may introduce singularities, for instance when 
-connecting this component with a fixed mass flow source. 
+this may introduce singularities, for instance when
+connecting this component with a fixed mass flow source.
 </p>
 <h4>Options</h4>
 <p>
-Parameter <code>deltax</code> sets the duration of 
-the transition region between the two flow regimes 
-as a fraction of <code>dp_nominal</code> or <code>m_flow_nominal</code>, 
-depending on the value of <code>from_dp</code>. 
+Parameter <code>deltax</code> sets the duration of
+the transition region between the two flow regimes
+as a fraction of <code>dp_nominal</code> or <code>m_flow_nominal</code>,
+depending on the value of <code>from_dp</code>.
 </p>
 <h4>Implementation</h4>
 <p>
-Note that the result in the transition region when 
-using <code>from_dp = true</code> is not identical to 
-the result when using <code>from_dp = false</code>. 
+Note that the result in the transition region when
+using <code>from_dp = true</code> is not identical to
+the result when using <code>from_dp = false</code>.
 </p>
 </html>",
 revisions="<html>

diff --git a/Annex60/Fluid/Interfaces/ConservationEquation.mo b/Annex60/Fluid/Interfaces/ConservationEquation.mo
@@ -276,7 +276,7 @@ Annex60.Fluid.MixingVolumes.MixingVolume</a>.
 <ul>
 <li>
 February 16, 2015, by Filip Jorissen:<br/>
-Fixed SteadyState massDynamics implementation for compressible media. 
+Fixed SteadyState massDynamics implementation for compressible media.
 Mass <code>m</code> is now constant.
 </li>
 <li>

diff --git a/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeMFactor.mo b/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeMFactor.mo
@@ -56,12 +56,12 @@ equation
 <p>This model contains two verifications for the implementation of <code>mSenFac</code>:</p>
 <ol>
 <li>
-The mixingVolume temperature <code>vol.T</code> should be constant. 
+The mixingVolume temperature <code>vol.T</code> should be constant.
 This is to check the correct implementation of the parameter <code>mSenFac</code> for moist air media.
 </li>
 <li>
 The temperature response of <code>volMFactor.T</code> and <code>vol1.T</code> should be nearly identical.
-Furthermore the response of the species concentration <code>Xi</code> demonstrates the 
+Furthermore the response of the species concentration <code>Xi</code> demonstrates the
 difference between using an <code>mSenFac = 10</code> and multiplying volume by <i>10</i>.
 </li>
 </ol>

diff --git a/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mo b/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mo
@@ -64,8 +64,8 @@ equation
   annotation (Documentation(
         info="<html>
 <p>
-This model shows that steady state mass dynamics are correctly simulated. 
-A change in pressure does not lead to an exchange and/or creation of mass. 
+This model shows that steady state mass dynamics are correctly simulated.
+A change in pressure does not lead to an exchange and/or creation of mass.
 The mixing volume temperature is also unaffected by a pressure change.
 </p>
 </html>", revisions="<html>

diff --git a/Annex60/Fluid/MixingVolumes/MixingVolume.mo b/Annex60/Fluid/MixingVolumes/MixingVolume.mo
@@ -60,9 +60,9 @@ without increasing its volume. This way, species concentrations are still calcul
 correctly even though the thermal mass increases. The additional thermal mass is calculated
 based on the density and the value of the function <code>HeatCapacityCp</code>
 of the medium state <code>state_default</code>. <br/>
-This parameter can for instance be useful in a pipe model when the developer wants to 
+This parameter can for instance be useful in a pipe model when the developer wants to
 lump the pipe thermal mass to the fluid volume. By default <code>mSenFac = 1</code>, hence
-the mass is unchanged. For higher values of <code>mSenFac</code>, the mass will be scaled proportionally. 
+the mass is unchanged. For higher values of <code>mSenFac</code>, the mass will be scaled proportionally.
 </li>
 </ul>
 <h4>Implementation</h4>

diff --git a/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo b/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo
@@ -88,7 +88,7 @@ User's Guide</a> for more information.
 March 6, 2015, by Michael Wetter<br/>
 Made performance record <code>per</code> replaceable
 as for the other models.
-</li>      
+</li>
 <li>
 January 6, 2015, by Michael Wetter:<br/>
 Revised model for OpenModelica.

diff --git a/Annex60/Media/Specialized/Air/PerfectGas.mo b/Annex60/Media/Specialized/Air/PerfectGas.mo
@@ -520,7 +520,7 @@ This medium uses the ideal gas law
 &rho; = p &frasl;(R T),
 </p>
 <p>
-where 
+where
 <i>&rho;</i> is the density,
 <i>p</i> is the pressure,
 <i>R</i> is the gas constant and

diff --git a/...x60/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos b/...x60/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos
@@ -1,7 +1,7 @@
 removePlots();
 simulateModel("Annex60.BoundaryConditions.SolarGeometry.Examples.IncidenceAngle", stopTime=86400, numberOfIntervals=500, method="dassl", resultFile="IncidenceAngle");
-createPlot(id=1, position={7, 7, 746, 517}, 
+createPlot(id=1, position={7, 7, 746, 517},
 y={"incAngHor.y", "incAngNor.y", "incAngWes.y", "incAngSou.y", "incAngEas.y"},
-range={0.0, 90000.0, 20.0, 180.0}, grid=true, 
+range={0.0, 90000.0, 20.0, 180.0}, grid=true,
 filename="IncidenceAngle.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}, {0,0,0}});
 
diff --git a/...sources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos b/...sources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos
@@ -1,9 +1,9 @@
 simulateModel("Annex60.Fluid.Actuators.Valves.Examples.TwoWayValvePressureIndependent", method="dassl", resultFile="TwoWayValvePressureIndependent");
 removePlots();
-createPlot(id=1, 
-y={"valInd.m_flow", "valIndDpFix.m_flow", "valIndFromMflow.m_flow"}, 
-grid=true, 
-leftTitleType=1, 
-bottomTitleType=1, 
+createPlot(id=1,
+y={"valInd.m_flow", "valIndDpFix.m_flow", "valIndFromMflow.m_flow"},
+grid=true,
+leftTitleType=1,
+bottomTitleType=1,
 filename = "TwoWayValvePressureIndependent.mat",
-colors={{0,0,255}, {255,0,0}, {0,128,0}});
+colors={{0,0,255}, {255,0,0}, {0,128,0}});
diff --git a/Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeMFactor.mos b/Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeMFactor.mos
@@ -1,31 +1,31 @@
-simulateModel("Annex60.Fluid.MixingVolumes.Examples.MixingVolumeMFactor", method="dassl", stopTime=100, resultFile="MixingVolumeMFactor");
-removePlots();
-createPlot(id=1, 
-position={15, 10, 482, 336}, 
-y={"volMFactor.T", "vol1.T"}, 
-range={0.0, 100.0, 290.0, 305.0}, 
-grid=true, 
-filename="MixingVolumeMFactor.mat", 
-leftTitleType=1, 
-bottomTitleType=1, 
-colors={{255,0,0}, {0,0,255}});
-createPlot(id=1, 
-position={15, 10, 482, 165}, 
-y={"vol1.Xi[1]", "volMFactor.Xi[1]"}, 
-range={0.0, 100.0, 0.005, 0.025}, 
-subPlot=2,
-grid=true, 
-leftTitleType=1, 
-bottomTitleType=1, 
-colors={{0,0,255}, {255,0,0}});
-createPlot(id=1, 
-position={19, -31, 482, 108}, 
-y={"vol.T"}, 
-range={0.0, 100.0, 250.0, 350.0}, 
-grid=true, 
-subPlot=3, 
-leftTitleType=1, 
-bottomTitleType=1, 
-colors={{0,0,255}});
-
-
+simulateModel("Annex60.Fluid.MixingVolumes.Examples.MixingVolumeMFactor", method="dassl", stopTime=100, resultFile="MixingVolumeMFactor");
+removePlots();
+createPlot(id=1,
+position={15, 10, 482, 336},
+y={"volMFactor.T", "vol1.T"},
+range={0.0, 100.0, 290.0, 305.0},
+grid=true,
+filename="MixingVolumeMFactor.mat",
+leftTitleType=1,
+bottomTitleType=1,
+colors={{255,0,0}, {0,0,255}});
+createPlot(id=1,
+position={15, 10, 482, 165},
+y={"vol1.Xi[1]", "volMFactor.Xi[1]"},
+range={0.0, 100.0, 0.005, 0.025},
+subPlot=2,
+grid=true,
+leftTitleType=1,
+bottomTitleType=1,
+colors={{0,0,255}, {255,0,0}});
+createPlot(id=1,
+position={19, -31, 482, 108},
+y={"vol.T"},
+range={0.0, 100.0, 250.0, 350.0},
+grid=true,
+subPlot=3,
+leftTitleType=1,
+bottomTitleType=1,
+colors={{0,0,255}});
+
+
diff --git a/...x60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos b/...x60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos
@@ -1,31 +1,31 @@
 oldStoreProtVar=Advanced.StoreProtectedVariables;
 Advanced.StoreProtectedVariables:=true;
 simulateModel("Annex60.Fluid.MixingVolumes.Examples.MixingVolumeSteadyStateMass", method="dassl", resultFile="MixingVolumeSteadyStateMass");
-createPlot(id=1, 
-position={0, 0, 804, 518}, 
-y={"vol.dynBal.m"}, 
-range={0.0, 1.0, 1.0, 1.4}, 
-grid=true, 
+createPlot(id=1,
+position={0, 0, 804, 518},
+y={"vol.dynBal.m"},
+range={0.0, 1.0, 1.0, 1.4},
+grid=true,
 subPlot=1,
-leftTitleType=1, 
-bottomTitleType=1, 
+leftTitleType=1,
+bottomTitleType=1,
 colors={{0,0,255}});
-createPlot(id=1, 
-position={0, 0, 804, 256}, 
-y={"vol.T"}, 
-range={0.0, 1.0, 260.0, 340.0}, 
-grid=true, 
-subPlot=2, 
-leftTitleType=1, 
-bottomTitleType=1, 
+createPlot(id=1,
+position={0, 0, 804, 256},
+y={"vol.T"},
+range={0.0, 1.0, 260.0, 340.0},
+grid=true,
+subPlot=2,
+leftTitleType=1,
+bottomTitleType=1,
 colors={{0,0,255}});
-createPlot(id=1, 
-position={35, 30, 730, 142}, 
-y={"sou.ports[1].m_flow", "vol.ports[2].m_flow"}, 
-range={0.0, 1.0, -0.02, 0.02}, 
-grid=true, 
-subPlot=3, 
-leftTitleType=1, 
-bottomTitleType=1, 
+createPlot(id=1,
+position={35, 30, 730, 142},
+y={"sou.ports[1].m_flow", "vol.ports[2].m_flow"},
+range={0.0, 1.0, -0.02, 0.02},
+grid=true,
+subPlot=3,
+leftTitleType=1,
+bottomTitleType=1,
 colors={{0,0,255}, {255,0,0}});
-Advanced.StoreProtectedVariables=oldStoreProtVar;
+Advanced.StoreProtectedVariables=oldStoreProtVar;
diff --git a/Annex60/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos b/Annex60/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos
@@ -1,10 +1,10 @@
 removePlots();
 simulateModel("Annex60.Utilities.Math.Examples.SmoothMin",  startTime=0, method="dassl", resultFile="SmoothMin");
-createPlot(id=1, 
-position={4, 21, 531, 524}, 
-y={"smoLim[2].y", "smoLim[1].y"}, 
-range={0.0, 1.0, -0.05, 0.55}, 
-grid=true, 
-leftTitleType=1, 
-bottomTitleType=1, 
+createPlot(id=1,
+position={4, 21, 531, 524},
+y={"smoLim[2].y", "smoLim[1].y"},
+range={0.0, 1.0, -0.05, 0.55},
+grid=true,
+leftTitleType=1,
+bottomTitleType=1,
 colors={{0,0,255}, {255,0,0}});
diff --git a/Annex60/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos b/Annex60/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos
@@ -1,12 +1,12 @@
 simulateModel("Annex60.Utilities.Time.Examples.ModelTime", startTime=-1, stopTime=1, method="dassl", resultFile="ModelTime");
 createPlot(
-id=1, 
+id=1,
 position={15, 10, 482, 336},
 y={"modTim.y"},
-range={-1.0, 1.0, -1.5, 1.5}, 
-grid=true, 
-filename="ModelTime.mat", 
-leftTitleType=1, 
-bottomTitleType=1, 
+range={-1.0, 1.0, -1.5, 1.5},
+grid=true,
+filename="ModelTime.mat",
+leftTitleType=1,
+bottomTitleType=1,
 colors={{0,0,255}});
 
diff --git a/Annex60/Utilities/Math/Examples/SmoothMin.mo b/Annex60/Utilities/Math/Examples/SmoothMin.mo
@@ -36,7 +36,7 @@ This model tests the implementation of
 Annex60.Utilities.Math.SmoothMin</a>.
 </p>
 <p>
-This model also illustrates that the output can be larger than 
+This model also illustrates that the output can be larger than
 the minimum of the two input signals. Smaller values for <code>deltaX</code>
 will reduce this effect. Therefore do not use this function when the minimum
 output value should be respected.