Skip to content

Commit

Permalink
Merge pull request #168 from tbeu/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
mwetter committed Feb 14, 2015
2 parents be6bb24 + 771a788 commit 16d4d92
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Annex60/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Moved the governing equations to
PartialTwoWayValveKv</a>
in order to be able to extend from this partial in
<a href=\"modelica://Annex60.Fluid.Actuators.Valves.TwoWayPressureIndependent\">
TwoWayPressureIndepedent</a>
TwoWayPressureIndependent</a>
</li>
<li>
August 8, 2014, by Michael Wetter:<br/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Classes that extend this model need to implement heat and
mass balance equations in a form like
</p>
<pre>
// transfered heat
// transferred heat
Q1_flow = eps * QMax_flow;
// no heat loss to ambient
0 = Q1_flow + Q2_flow;
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Fluid/Interfaces/ConservationEquation.mo
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ model ConservationEquation "Lumped volume with mass and energy balance"
(mSenFac - 1)*rho_default*cp_default*fluidVolume
"Aditional heat capacity for implementing mFactor";
Modelica.Blocks.Interfaces.RealInput Q_flow(unit="W")
"Sensible plus latent heat flow rate transfered into the medium"
"Sensible plus latent heat flow rate transferred into the medium"
annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
Modelica.Blocks.Interfaces.RealInput mWat_flow(unit="kg/s")
"Moisture mass flow rate added to the medium"
Expand Down
4 changes: 2 additions & 2 deletions Annex60/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ model StaticFourPortHeatMassExchanger
annotation(Evaluate=true, Dialog(tab="Advanced"));

input Modelica.SIunits.HeatFlowRate Q1_flow
"Heat transfered into the medium 1";
"Heat transferred into the medium 1";
input Medium1.MassFlowRate mWat1_flow
"Moisture mass flow rate added to the medium 1";
input Modelica.SIunits.HeatFlowRate Q2_flow
"Heat transfered into the medium 2";
"Heat transferred into the medium 2";
input Medium2.MassFlowRate mWat2_flow
"Moisture mass flow rate added to the medium 2";
constant Boolean sensibleOnly1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model StaticTwoPortConservationEquation
constant Boolean sensibleOnly "Set to true if sensible exchange only";

Modelica.Blocks.Interfaces.RealInput Q_flow(unit="W")
"Sensible plus latent heat flow rate transfered into the medium"
"Sensible plus latent heat flow rate transferred into the medium"
annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
Modelica.Blocks.Interfaces.RealInput mWat_flow(unit="kg/s")
"Moisture mass flow rate added to the medium"
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ model StaticTwoPortHeatMassExchanger
annotation(Evaluate=true, Dialog(tab="Advanced"));

// Model inputs
input Modelica.SIunits.HeatFlowRate Q_flow "Heat transfered into the medium";
input Modelica.SIunits.HeatFlowRate Q_flow "Heat transferred into the medium";
input Modelica.SIunits.MassFlowRate mWat_flow
"Moisture mass flow rate added to the medium";

Expand Down
2 changes: 1 addition & 1 deletion Annex60/Fluid/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ computation of the pressure drop would require detailed knowledge of the duct or
dimensions and the flow bends and junctions. This information is often not available during
early design. However, if a more detailed pressure drop calculation is required, then models from
<a href=\"modelica://Modelica.Fluid\">
Modelica.Fluid</a> can be used in conjuction with models from the <code>Buildings</code> library.
Modelica.Fluid</a> can be used in conjunction with models from the <code>Buildings</code> library.
</p>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ within Annex60.Utilities.Math.Functions.Examples;
model InverseXRegularized
"Test problem for function that replaces 1/x around the origin by a twice continuously differentiable function"
extends Modelica.Icons.Example;
Real x "Indepedent variable";
Real x "Independent variable";
parameter Real delta = 0.5 "Small value for approximation";
Real y "Function value";
Real xInv "Function value";
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Utilities/Math/InverseXRegularized.mo
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ equation
<ul>
<li>
November 29, 2013, by Marcus Fuchs:<br/>
Implementation based on Funtions.inverseXRegularized.
Implementation based on Functions.inverseXRegularized.
</li>
</ul>
</html>"), Icon(graphics={ Text(
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Utilities/Math/QuadraticLinear.mo
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ equation
<ul>
<li>
November 29, 2013 by Marcus Fuchs:<br/>
Implementation based on Funtions.quadraticLinear.
Implementation based on Functions.quadraticLinear.
</li>
</ul>
</html>"), Icon(graphics={ Text(
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Utilities/Math/SmoothExponential.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ equation
<ul>
<li>
November 29, 2013 by Marcus Fuchs:<br/>
Implementation based on Funtions.smoothExponential.
Implementation based on Functions.smoothExponential.
</li>
</ul>
</html>"), Icon(graphics={ Text(
Expand Down
2 changes: 1 addition & 1 deletion Annex60/Utilities/Math/TrapezoidalIntegration.mo
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ equation
<ul>
<li>
November 29, 2013 by Marcus Fuchs:<br/>
Implementation based on Funtions.trapezoidalIntegration.
Implementation based on Functions.trapezoidalIntegration.
</li>
</ul>
</html>"));
Expand Down

0 comments on commit 16d4d92

Please sign in to comment.