Commit a230e8d4 authored by Andrew Heather's avatar Andrew Heather
Browse files

STYLE: Correcting typos

parent 3a569c9f
......@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
#include "setDeltaT.H"
// Indicators for refinement. Note: before runTime++
// only for postprocessing reasons.
// only for post-processing reasons.
tmp<volScalarField> tmagGradP = mag(fvc::grad(p));
volScalarField normalisedGradP
(
......
......@@ -25,7 +25,7 @@ Class
Foam::XiEqModels::basicSubGrid
Description
Basic sub-grid obstacle flame-wrinking enhancement factor model.
Basic sub-grid obstacle flame-wrinkling enhancement factor model.
Details supplied by J Puttock 2/7/06.
<b> Sub-grid flame area generation </b>
......@@ -125,7 +125,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const;
//- Update properties from given dictionary
......
......@@ -26,7 +26,7 @@ Class
Description
Basic sub-grid obstacle flame-wrinking generation rate coefficient model.
Basic sub-grid obstacle flame-wrinkling generation rate coefficient model.
Details supplied by J Puttock 2/7/06.
\f$ G_{sub} \f$ denotes the generation coefficient and it is given by
......@@ -113,7 +113,7 @@ public:
// Member Functions
//- Return the flame-wrinking generation rate
//- Return the flame-wrinkling generation rate
virtual tmp<volScalarField> G() const;
//- Return the flame diffusivity
......
......@@ -129,7 +129,7 @@ void PDRkEpsilon::correct()
volScalarField G(GName(), rho_*nut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
// Update espsilon and G at the wall
// Update epsilon and G at the wall
epsilon_.boundaryFieldRef().updateCoeffs();
// Add the blockage generation term so that it is included consistently
......
......@@ -101,7 +101,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const;
//- Update properties from given dictionary
......
......@@ -97,7 +97,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const;
//- Update properties from given dictionary
......
......@@ -115,7 +115,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const;
//- Update properties from given dictionary
......
......@@ -144,7 +144,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const
{
return turbulence_.muEff();
......
......@@ -96,7 +96,7 @@ public:
// Member Functions
//- Return the flame-wrinking XiEq
//- Return the flame-wrinkling XiEq
virtual tmp<volScalarField> XiEq() const;
//- Update properties from given dictionary
......
......@@ -91,7 +91,7 @@ public:
// Member Functions
//- Return the flame-wrinking generation rate
//- Return the flame-wrinkling generation rate
virtual tmp<volScalarField> G() const;
//- Update properties from given dictionary
......
......@@ -135,7 +135,7 @@ public:
// Member Functions
//- Return the flame-wrinking genration rate
//- Return the flame-wrinkling generation rate
virtual tmp<volScalarField> G() const = 0;
//- Return the flame diffusivity
......
......@@ -25,7 +25,7 @@ Class
Foam::XiGModels::instabilityG
Description
Flame-surface instabilityG flame-wrinking generation rate coefficient model
Flame-surface instabilityG flame-wrinkling generation rate coefficient model
used in \link XiModel.H \endlink.
See Technical Report SH/RE/01R for details on the PDR modelling.
......@@ -57,7 +57,7 @@ class instabilityG
{
// Private data
//- Flame instabilityG wrinling generation rate coefficient
//- Flame instabilityG wrinkling generation rate coefficient
dimensionedScalar GIn_;
//- InstabilityG length-scale
......@@ -100,7 +100,7 @@ public:
// Member Functions
//- Return the flame-wrinking generation rate
//- Return the flame-wrinkling generation rate
virtual tmp<volScalarField> G() const;
//- Return the flame diffusivity
......
......@@ -122,7 +122,7 @@ protected:
const volScalarField& b_;
const surfaceScalarField& phi_;
//- Flame wrinking field
//- Flame wrinkling field
volScalarField Xi_;
......@@ -207,7 +207,7 @@ public:
// Member Functions
//- Return the flame-wrinking Xi
//- Return the flame-wrinkling Xi
virtual const volScalarField& Xi() const
{
return Xi_;
......@@ -227,10 +227,10 @@ public:
)
{}
//- Correct the flame-wrinking Xi
//- Correct the flame-wrinkling Xi
virtual void correct() = 0;
//- Correct the flame-wrinking Xi using the given convection scheme
//- Correct the flame-wrinkling Xi using the given convection scheme
virtual void correct(const fv::convectionScheme<scalar>&)
{
correct();
......
......@@ -104,7 +104,7 @@ public:
//- Return the flame diffusivity
virtual tmp<volScalarField> Db() const;
//- Correct the flame-wrinking Xi
//- Correct the flame-wrinkling Xi
virtual void correct();
//- Update properties from given dictionary
......
......@@ -89,7 +89,7 @@ public:
// Member Functions
//- Correct the flame-wrinking Xi
//- Correct the flame-wrinkling Xi
virtual void correct()
{}
......
......@@ -113,13 +113,13 @@ public:
fields.add(Xi_);
}
//- Correct the flame-wrinking Xi
//- Correct the flame-wrinkling Xi
virtual void correct()
{
NotImplemented;
}
//- Correct the flame-wrinking Xi using the given convection scheme
//- Correct the flame-wrinkling Xi using the given convection scheme
virtual void correct(const fv::convectionScheme<scalar>& mvConvection);
//- Update properties from given dictionary
......
......@@ -82,8 +82,8 @@ Foam::laminarFlameSpeedModels::SCOPE::SCOPE
)()
).optionalSubDict(typeName + "Coeffs")
),
LFL_(readScalar(coeffsDict_.lookup("lowerFlamabilityLimit"))),
UFL_(readScalar(coeffsDict_.lookup("upperFlamabilityLimit"))),
LFL_(readScalar(coeffsDict_.lookup("lowerFlammabilityLimit"))),
UFL_(readScalar(coeffsDict_.lookup("upperFlammabilityLimit"))),
SuPolyL_(coeffsDict_.subDict("lowerSuPolynomial")),
SuPolyU_(coeffsDict_.subDict("upperSuPolynomial")),
Texp_(readScalar(coeffsDict_.lookup("Texp"))),
......@@ -145,19 +145,19 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::SuRef
{
if (phi < LFL_ || phi > UFL_)
{
// Return 0 beyond the flamibility limits
// Return 0 beyond the flammability limits
return scalar(0);
}
else if (phi < SuPolyL_.ll)
{
// Use linear interpolation between the low end of the
// lower polynomial and the lower flamibility limit
// lower polynomial and the lower flammability limit
return SuPolyL_.llv*(phi - LFL_)/(SuPolyL_.ll - LFL_);
}
else if (phi > SuPolyU_.ul)
{
// Use linear interpolation between the upper end of the
// upper polynomial and the upper flamibility limit
// upper polynomial and the upper flammability limit
return SuPolyU_.ulv*(UFL_ - phi)/(UFL_ - SuPolyU_.ul);
}
else if (phi < SuPolyL_.lu)
......
......@@ -109,10 +109,10 @@ class SCOPE
dictionary coeffsDict_;
//- Lower flamability limit
//- Lower flammability limit
scalar LFL_;
//- Upper flamability limit
//- Upper flammability limit
scalar UFL_;
//- Lower Su polynomial
......
......@@ -89,7 +89,7 @@ else
}
}
// The incompressibe form of the continuity error check is appropriate for
// The incompressible form of the continuity error check is appropriate for
// steady-state compressible also.
#include "incompressible/continuityErrs.H"
......
......@@ -63,7 +63,7 @@ else
<< endl;
}
// store local id of near-walll cell to process
// store local id of near-wall cell to process
label cellId = patches[patchId].faceCells()[faceId];
// create position array for graph generation
......
......@@ -13,7 +13,7 @@ scalarListList weightCellCells(mesh.nInternalFaces());
// Interpolated HbyA faces
vectorField UIntFaces(mesh.nInternalFaces(), vector::zero);
// Determine receptor neighbourd cells
// Determine receptor neighbour cells
labelList receptorNeigCell(mesh.nInternalFaces(), -1);
{
......
......@@ -45,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatch Declaration
Class alphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/
class alphaContactAngleFvPatchScalarField
......@@ -65,7 +65,7 @@ public:
//- Limiting advancing contact angle
scalar thetaA_;
//- Limiting receeding contact angle
//- Limiting receding contact angle
scalar thetaR_;
......@@ -100,7 +100,7 @@ public:
else return 180.0 - thetaA_;
}
//- Return the limiting receeding contact angle
//- Return the limiting receding contact angle
scalar thetaR(bool matched=true) const
{
if (matched) return thetaR_;
......
......@@ -100,20 +100,20 @@ public:
// Member Functions
//- Return access to the inernal energy field [J/Kg]
//- Return access to the internal energy field [J/Kg]
virtual volScalarField& he()
{
return e_;
}
//- Return access to the inernal energy field [J/Kg]
//- Return access to the internal energy field [J/Kg]
virtual const volScalarField& he() const
{
return e_;
}
//- Enthalpy/Internal energy
// for given pressure and temperature [J/kg]
//- for given pressure and temperature [J/kg]
virtual tmp<volScalarField> he
(
const volScalarField& p,
......@@ -159,14 +159,14 @@ public:
//- Return true if the equation of state is incompressible
// i.e. rho != f(p)
//- i.e. rho != f(p)
bool incompressible() const
{
return (true);
}
//- Return true if the equation of state is isochoric
// i.e. rho = const
//- i.e. rho = const
bool isochoric() const
{
return (false);
......@@ -189,7 +189,7 @@ public:
const label patchi
) const;
//- Return Cv of the mixture
//- Return Cv of the mixture
virtual tmp<volScalarField> Cv() const;
//- Heat capacity at constant volume for patch [J/kg/K]
......@@ -237,21 +237,21 @@ public:
virtual tmp<volScalarField> kappa() const;
//- Thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
//- of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappa
(
const label patchi
) const;
//- Effective thermal diffusivity for temperature
// of mixture [J/m/s/K]
//- of mixture [J/m/s/K]
virtual tmp<volScalarField> kappaEff
(
const volScalarField&
) const;
//- Effective thermal diffusivity for temperature
// of mixture for patch [J/m/s/K]
//- of mixture for patch [J/m/s/K]
virtual tmp<scalarField> kappaEff
(
const scalarField& alphat,
......@@ -272,7 +272,7 @@ public:
) const;
//- Correct the thermo fields
//- Correct the thermo fields
virtual void correct();
//- Read properties
......@@ -298,7 +298,6 @@ public:
{
return pDivU_;
}
};
......
......@@ -128,13 +128,13 @@ public:
return residualSlip_;
}
//- The dragfunction K used in the momentum eq.
//- The drag function K used in the momentum eq.
// ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
// ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(U2-U1)
// ********************************** NB! *****************************
// for numerical reasons alpha1 and alpha2 has been
// extracted from the dragFunction K,
// so you MUST divide K by alpha1*alpha2 when implemnting the drag
// so you MUST divide K by alpha1*alpha2 when implementing the drag
// function
// ********************************** NB! *****************************
virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
......
......@@ -45,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatch Declaration
Class alphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/
class alphaContactAngleFvPatchScalarField
......@@ -65,7 +65,7 @@ public:
//- Limiting advancing contact angle
scalar thetaA_;
//- Limiting receeding contact angle
//- Limiting receding contact angle
scalar thetaR_;
......@@ -100,7 +100,7 @@ public:
else return 180.0 - thetaA_;
}
//- Return the limiting receeding contact angle
//- Return the limiting receding contact angle
scalar thetaR(bool matched=true) const
{
if (matched) return thetaR_;
......
......@@ -45,7 +45,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatch Declaration
Class alphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/
class alphaContactAngleFvPatchScalarField
......@@ -65,7 +65,7 @@ public:
//- Limiting advancing contact angle
scalar thetaA_;
//- Limiting receeding contact angle
//- Limiting receding contact angle
scalar thetaR_;
......@@ -100,7 +100,7 @@ public:
else return 180.0 - thetaA_;
}
//- Return the limiting receeding contact angle
//- Return the limiting receding contact angle
scalar thetaR(bool matched=true) const
{
if (matched) return thetaR_;
......
......@@ -54,7 +54,7 @@ namespace interfaceCompositionModels
{
/*---------------------------------------------------------------------------*\
Class NonRandomTwoLiquid Declaration
Class NonRandomTwoLiquid Declaration
\*---------------------------------------------------------------------------*/
template<class Thermo, class OtherThermo>
......@@ -76,10 +76,10 @@ class NonRandomTwoLiquid
//- Name of species 2
word species2Name_;
//- Indiex of species 1 within this thermo
//- Index of species 1 within this thermo
label species1Index_;
//- Indiex of species 2 within this thermo
//- Index of species 2 within this thermo
label species2Index_;
//- Non-randomness constant parameter for species 1
......@@ -88,10 +88,10 @@ class NonRandomTwoLiquid
//- Non-randomness constant parameter for species 2
dimensionedScalar alpha21_;
//- Non-randomness linear paramater for species 1
//- Non-randomness linear parameter for species 1
dimensionedScalar beta12_;
//- Non-randomness linear paramater for species 2
//- Non-randomness linear parameter for species 2
dimensionedScalar beta21_;
//- Interaction parameter model for species 1
......
......@@ -74,8 +74,8 @@ protected:
// Private Member Functions
//- Constant of propotionality between partial pressure and mass
// fraction
//- Constant of proportionality between partial pressure and mass
//- fraction
tmp<volScalarField> wRatioByP() const;
......
......@@ -93,7 +93,7 @@ public:
//- Saturation pressure
virtual tmp<volScalarField> pSat(const volScalarField& T) const;
//- Saturation pressure derivetive w.r.t. temperature
//- Saturation pressure derivative w.r.t. temperature
virtual tmp<volScalarField> pSatPrime(const volScalarField& T) const;
//- Natural log of the saturation pressure
......
......@@ -93,7 +93,7 @@ public:
//- Saturation pressure
virtual tmp<volScalarField> pSat(const volScalarField& T) const;
//- Saturation pressure derivetive w.r.t. temperature