Commit 7e34048c authored by Andrew Heather's avatar Andrew Heather
Browse files

cosmetics

parent cbe5974c
......@@ -143,6 +143,7 @@ void Foam::basicThermo::eBoundaryCorrection(volScalarField& e)
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicThermo::basicThermo(const fvMesh& mesh)
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class fixedEnthalpyFvPatchScalarField Declaration
Class fixedEnthalpyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class fixedEnthalpyFvPatchScalarField
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class fixedInternalEnergyFvPatchScalarField Declaration
Class fixedInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class fixedInternalEnergyFvPatchScalarField
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class gradientEnthalpyFvPatchScalarField Declaration
Class gradientEnthalpyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class gradientEnthalpyFvPatchScalarField
......
......@@ -37,7 +37,8 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
......@@ -47,7 +48,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
(
const gradientInternalEnergyFvPatchScalarField& ptf,
const fvPatch& p,
......@@ -59,7 +61,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -70,7 +73,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
(
const gradientInternalEnergyFvPatchScalarField& tppsf
)
......@@ -79,7 +83,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
(
const gradientInternalEnergyFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF
......@@ -102,10 +107,10 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
(
"thermophysicalProperties"
);
const label patchi = patch().index();
fvPatchScalarField& Tw =
fvPatchScalarField& Tw =
const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
Tw.evaluate();
......@@ -123,7 +128,11 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField);
makePatchTypeField
(
fvPatchScalarField,
gradientInternalEnergyFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class gradientInternalEnergyFvPatchScalarField Declaration
Class gradientInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class gradientInternalEnergyFvPatchScalarField
......
......@@ -106,7 +106,7 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
(
"thermophysicalProperties"
);
const label patchi = patch().index();
mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
......@@ -118,7 +118,8 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
valueFraction() = Tw.valueFraction();
refValue() = thermo.e(Tw.refValue(), patchi);
refGrad() = thermo.Cv(Tw, patchi)*Tw.refGrad()
refGrad() =
thermo.Cv(Tw, patchi)*Tw.refGrad()
+ patch().deltaCoeffs()*
(
thermo.e(Tw, patchi)
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class mixedInternalEnergyFvPatchScalarField Declaration
Class mixedInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class mixedInternalEnergyFvPatchScalarField
......
......@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class pureMixture Declaration
Class pureMixture Declaration
\*---------------------------------------------------------------------------*/
template<class ThermoType>
......@@ -76,9 +76,8 @@ public:
pureMixture(const dictionary&, const fvMesh&);
// Destructor
~pureMixture();
//- Destructor
virtual ~pureMixture();
// Member functions
......
......@@ -168,7 +168,7 @@ public:
// Chemistry model functions (overriding abstract functions in
// chemistryModel.H)
// basicChemistryModel.H)
//- Return const access to the chemical source terms
inline tmp<volScalarField> RR(const label i) const;
......
......@@ -116,8 +116,7 @@ Foam::scalar Foam::EulerImplicit<CompType, ThermoType>::solve
RR[si][lRef] -= sr*pf*corr;
RR[si][rRef] += sr*pr*corr;
}
} // end for(label i...
}
for (label i=0; i<nSpecie; i++)
......
......@@ -111,8 +111,7 @@ Foam::scalar Foam::sequential<CompType, ThermoType>::solve
c[si] += dt*sr*omeg;
c[si] = max(0.0, c[si]);
}
} // end for (label i...
}
return cTauChem_/tChemInv;
}
......
......@@ -116,19 +116,13 @@ public:
// Constructors
//- Construct from dictionary
liquidMixture
(
const dictionary&
);
liquidMixture(const dictionary&);
// Selectors
//- Select construct from dictionary
static autoPtr<liquidMixture> New
(
const dictionary&
);
static autoPtr<liquidMixture> New(const dictionary&);
// Member Functions
......
......@@ -25,9 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "liquidMixture.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//#include "IOstreams.H"
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
/*
......
......@@ -64,19 +64,13 @@ public:
// Constructors
//- Construct from dictionary
solidMixture
(
const dictionary&
);
solidMixture(const dictionary&);
// Selectors
//- Select construct from dictionary
static autoPtr<solidMixture> New
(
const dictionary&
);
static autoPtr<solidMixture> New(const dictionary&);
// Member Functions
......@@ -101,17 +95,11 @@ public:
//- Calculate the mixture density [kg/m^3] as a function of
// volume fractions
scalar rho
(
const scalarField& X
) const;
scalar rho(const scalarField& X) const;
//- Calculate the mixture heat capacity [J/(kg K)] as a function
// of mass fractions
scalar cp
(
const scalarField& Y
) const;
scalar cp(const scalarField& Y) const;
};
......
......@@ -55,9 +55,9 @@ Foam::thermalPorousZone::thermalPorousZone
(
"thermalPorousZone::thermalPorousZone"
"("
"const word& name, "
"const fvMesh& mesh, "
"const dictionary& dict"
"const word& name, "
"const fvMesh& mesh, "
"const dictionary& dict"
")",
*dictPtr
) << "thermalModel " << thermalModel << " is not supported" << nl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment