zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
andy
2009-10-26 18:54:34 +00:00
parent cbe5974c26
commit 7e34048c59
16 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/thermophysicalModels/basic/basicThermo/basicThermo.C
View File

@ -143,6 +143,7 @@ void Foam::basicThermo::eBoundaryCorrection(volScalarField& e)
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicThermo::basicThermo(const fvMesh& mesh) Foam::basicThermo::basicThermo(const fvMesh& mesh)

2
src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class fixedEnthalpyFvPatchScalarField Declaration Class fixedEnthalpyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class fixedEnthalpyFvPatchScalarField class fixedEnthalpyFvPatchScalarField

2
src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class fixedInternalEnergyFvPatchScalarField Declaration Class fixedInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class fixedInternalEnergyFvPatchScalarField class fixedInternalEnergyFvPatchScalarField

2
src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class gradientEnthalpyFvPatchScalarField Declaration Class gradientEnthalpyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class gradientEnthalpyFvPatchScalarField class gradientEnthalpyFvPatchScalarField

25
src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
View File

@ -37,7 +37,8 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -47,7 +48,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{} {}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
( (
const gradientInternalEnergyFvPatchScalarField& ptf, const gradientInternalEnergyFvPatchScalarField& ptf,
const fvPatch& p, const fvPatch& p,
@ -59,7 +61,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{} {}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
@ -70,7 +73,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{} {}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
( (
const gradientInternalEnergyFvPatchScalarField& tppsf const gradientInternalEnergyFvPatchScalarField& tppsf
) )
@ -79,7 +83,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
{} {}
gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField gradientInternalEnergyFvPatchScalarField::
gradientInternalEnergyFvPatchScalarField
( (
const gradientInternalEnergyFvPatchScalarField& tppsf, const gradientInternalEnergyFvPatchScalarField& tppsf,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -102,10 +107,10 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
( (
"thermophysicalProperties" "thermophysicalProperties"
); );
const label patchi = patch().index(); const label patchi = patch().index();
fvPatchScalarField& Tw = fvPatchScalarField& Tw =
const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]); const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
Tw.evaluate(); Tw.evaluate();
@ -123,7 +128,11 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField); makePatchTypeField
(
fvPatchScalarField,
gradientInternalEnergyFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class gradientInternalEnergyFvPatchScalarField Declaration Class gradientInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class gradientInternalEnergyFvPatchScalarField class gradientInternalEnergyFvPatchScalarField

5
src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
View File

@ -106,7 +106,7 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
( (
"thermophysicalProperties" "thermophysicalProperties"
); );
const label patchi = patch().index(); const label patchi = patch().index();
mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField> mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
@ -118,7 +118,8 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
valueFraction() = Tw.valueFraction(); valueFraction() = Tw.valueFraction();
refValue() = thermo.e(Tw.refValue(), patchi); refValue() = thermo.e(Tw.refValue(), patchi);
refGrad() = thermo.Cv(Tw, patchi)*Tw.refGrad() refGrad() =
thermo.Cv(Tw, patchi)*Tw.refGrad()
+ patch().deltaCoeffs()* + patch().deltaCoeffs()*
( (
thermo.e(Tw, patchi) thermo.e(Tw, patchi)

2
src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class mixedInternalEnergyFvPatchScalarField Declaration Class mixedInternalEnergyFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class mixedInternalEnergyFvPatchScalarField class mixedInternalEnergyFvPatchScalarField

7
src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class pureMixture Declaration Class pureMixture Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class ThermoType> template<class ThermoType>
@ -76,9 +76,8 @@ public:
pureMixture(const dictionary&, const fvMesh&); pureMixture(const dictionary&, const fvMesh&);
// Destructor //- Destructor
virtual ~pureMixture();
~pureMixture();
// Member functions // Member functions

2
src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
View File

@ -168,7 +168,7 @@ public:
// Chemistry model functions (overriding abstract functions in // Chemistry model functions (overriding abstract functions in
// chemistryModel.H) // basicChemistryModel.H)
//- Return const access to the chemical source terms //- Return const access to the chemical source terms
inline tmp<volScalarField> RR(const label i) const; inline tmp<volScalarField> RR(const label i) const;

3
src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
View File

@ -116,8 +116,7 @@ Foam::scalar Foam::EulerImplicit<CompType, ThermoType>::solve
RR[si][lRef] -= sr*pf*corr; RR[si][lRef] -= sr*pf*corr;
RR[si][rRef] += sr*pr*corr; RR[si][rRef] += sr*pr*corr;
} }
}
} // end for(label i...
for (label i=0; i<nSpecie; i++) for (label i=0; i<nSpecie; i++)

3
src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
View File

@ -111,8 +111,7 @@ Foam::scalar Foam::sequential<CompType, ThermoType>::solve
c[si] += dt*sr*omeg; c[si] += dt*sr*omeg;
c[si] = max(0.0, c[si]); c[si] = max(0.0, c[si]);
} }
}
} // end for (label i...
return cTauChem_/tChemInv; return cTauChem_/tChemInv;
} }

10
src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
View File

@ -116,19 +116,13 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
liquidMixture liquidMixture(const dictionary&);
(
const dictionary&
);
// Selectors // Selectors
//- Select construct from dictionary //- Select construct from dictionary
static autoPtr<liquidMixture> New static autoPtr<liquidMixture> New(const dictionary&);
(
const dictionary&
);
// Member Functions // Member Functions

4
src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
View File

@ -25,9 +25,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "liquidMixture.H" #include "liquidMixture.H"
#include "IOstreams.H" //#include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
/* /*

20
src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
View File

@ -64,19 +64,13 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
solidMixture solidMixture(const dictionary&);
(
const dictionary&
);
// Selectors // Selectors
//- Select construct from dictionary //- Select construct from dictionary
static autoPtr<solidMixture> New static autoPtr<solidMixture> New(const dictionary&);
(
const dictionary&
);
// Member Functions // Member Functions
@ -101,17 +95,11 @@ public:
//- Calculate the mixture density [kg/m^3] as a function of //- Calculate the mixture density [kg/m^3] as a function of
// volume fractions // volume fractions
scalar rho scalar rho(const scalarField& X) const;
(
const scalarField& X
) const;
//- Calculate the mixture heat capacity [J/(kg K)] as a function //- Calculate the mixture heat capacity [J/(kg K)] as a function
// of mass fractions // of mass fractions
scalar cp scalar cp(const scalarField& Y) const;
(
const scalarField& Y
) const;
}; };

6
src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
View File

@ -55,9 +55,9 @@ Foam::thermalPorousZone::thermalPorousZone
( (
"thermalPorousZone::thermalPorousZone" "thermalPorousZone::thermalPorousZone"
"(" "("
"const word& name, " "const word& name, "
"const fvMesh& mesh, " "const fvMesh& mesh, "
"const dictionary& dict" "const dictionary& dict"
")", ")",
*dictPtr *dictPtr
) << "thermalModel " << thermalModel << " is not supported" << nl ) << "thermalModel " << thermalModel << " is not supported" << nl