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

STYLE: Multiple updates related to code style

Browse Source
This commit is contained in:
andy
2010-12-08 17:52:58 +00:00
parent 679a61af07
commit 34f55c4f9d
14 changed files with 61 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
View File

@ -50,7 +50,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class basicSolidThermo Declaration Class basicSolidThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class basicSolidThermo class basicSolidThermo
@ -109,8 +109,7 @@ public:
//- Destructor //- Destructor
virtual ~basicSolidThermo();
virtual ~basicSolidThermo();
// Member functions // Member functions
@ -204,7 +203,7 @@ public:
//- Read thermophysicalProperties dictionary //- Read thermophysicalProperties dictionary
virtual bool read() = 0; virtual bool read() = 0;
// Ostream Operator //- Ostream Operator
friend Ostream& operator<<(Ostream& os, const basicSolidThermo& s); friend Ostream& operator<<(Ostream& os, const basicSolidThermo& s);
}; };

9
src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
View File

@ -43,7 +43,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class constSolidThermo Declaration Class constSolidThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class constSolidThermo class constSolidThermo
@ -159,11 +159,8 @@ public:
//- Read solidThermophysicalProperties dictionary //- Read solidThermophysicalProperties dictionary
bool read(const dictionary&); bool read(const dictionary&);
//- Ostream Operator
friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
// Ostream Operator
friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
}; };

4
src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
View File

@ -309,8 +309,8 @@ void Foam::directionalKSolidThermo::correct()
} }
const Foam::volSymmTensorField& Foam::directionalKSolidThermo:: const Foam::volSymmTensorField&
directionalK() const Foam::directionalKSolidThermo::directionalK() const
{ {
return directionalK_; return directionalK_;
} }

20
src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class directionalKSolidThermo Declaration Class directionalKSolidThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class directionalKSolidThermo class directionalKSolidThermo
@ -99,8 +99,8 @@ public:
directionalKSolidThermo(const fvMesh& mesh); directionalKSolidThermo(const fvMesh& mesh);
// Destructor //- Destructor
virtual ~directionalKSolidThermo(); virtual ~directionalKSolidThermo();
// Member Functions // Member Functions
@ -136,14 +136,12 @@ public:
//- Read the directionalKSolidThermo properties //- Read the directionalKSolidThermo properties
bool read(const dictionary& dict); bool read(const dictionary& dict);
//- Ostream Operator
// Ostream Operator friend Ostream& operator<<
(
friend Ostream& operator<< Ostream& os,
( const directionalKSolidThermo& s
Ostream& os, );
const directionalKSolidThermo& s
);
}; };

3
src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
View File

@ -31,7 +31,6 @@ License
Foam::interpolateSolid::interpolateSolid(const dictionary& dict) Foam::interpolateSolid::interpolateSolid(const dictionary& dict)
{ {
read(dict); read(dict);
Info<< "Constructed directionalKSolidThermo with samples" << nl Info<< "Constructed directionalKSolidThermo with samples" << nl
@ -108,4 +107,6 @@ bool Foam::interpolateSolid::read(const dictionary& dict)
sigmaSValues_ = Field<scalar>(dict.lookup("sigmaSValues")); sigmaSValues_ = Field<scalar>(dict.lookup("sigmaSValues"));
return true; return true;
} }
// ************************************************************************* // // ************************************************************************* //

5
src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolateSolid Declaration Class interpolateSolid Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class interpolateSolid class interpolateSolid
@ -77,8 +77,7 @@ public:
//- Destructor //- Destructor
virtual ~interpolateSolid();
virtual ~interpolateSolid();
// Member Functions // Member Functions

16
src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolatedSolidThermo Declaration Class interpolatedSolidThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class interpolatedSolidThermo class interpolatedSolidThermo
@ -119,14 +119,12 @@ public:
//- Read the interpolatedSolidThermo properties //- Read the interpolatedSolidThermo properties
bool read(const dictionary& dict); bool read(const dictionary& dict);
//- Ostream Operator
// Ostream Operator friend Ostream& operator<<
(
friend Ostream& operator<< Ostream& os,
( const interpolatedSolidThermo& s
Ostream& os, );
const interpolatedSolidThermo& s
);
}; };

9
src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
View File

@ -43,7 +43,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class isotropicKSolidThermo Declaration Class isotropicKSolidThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class isotropicKSolidThermo class isotropicKSolidThermo
@ -71,9 +71,10 @@ public:
isotropicKSolidThermo(const fvMesh& mesh); isotropicKSolidThermo(const fvMesh& mesh);
// Destructor //- Destructor
virtual ~isotropicKSolidThermo(); virtual ~isotropicKSolidThermo();
// Member functions // Member functions
//- Update properties //- Update properties
@ -102,9 +103,7 @@ public:
//- Write properties //- Write properties
virtual bool writeData(Ostream& os) const; virtual bool writeData(Ostream& os) const;
//- Ostream Operator
// Ostream Operator
friend Ostream& operator<< friend Ostream& operator<<
( (
Ostream& os, Ostream& os,

14
src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
View File

@ -43,8 +43,9 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class multiComponentSolidMixture Declaration Class multiComponentSolidMixture Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class ThermoSolidType> template<class ThermoSolidType>
class multiComponentSolidMixture class multiComponentSolidMixture
: :
@ -65,6 +66,7 @@ class multiComponentSolidMixture
//- Return molar fraction for component i in celli and at T //- Return molar fraction for component i in celli and at T
scalar X(label i, label celli, scalar T) const; scalar X(label i, label celli, scalar T) const;
public: public:
@ -75,9 +77,8 @@ public:
//- Destructor //- Destructor
virtual ~multiComponentSolidMixture()
virtual ~multiComponentSolidMixture() {}
{}
// Member Functions // Member Functions
@ -92,7 +93,7 @@ public:
void read(const dictionary&); void read(const dictionary&);
// Cell based properties. // Cell-based properties
//- Density //- Density
virtual scalar rho(scalar T, label celli) const; virtual scalar rho(scalar T, label celli) const;
@ -118,9 +119,8 @@ public:
//- Total enthalpy //- Total enthalpy
virtual scalar h(scalar T, label celli) const; virtual scalar h(scalar T, label celli) const;
//- Cp //- Specific heat capacity
virtual scalar Cp(scalar T, label celli) const; virtual scalar Cp(scalar T, label celli) const;
}; };

2
src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
View File

@ -44,7 +44,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class reactingSolidMixture Declaration Class reactingSolidMixture Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class ThermoSolidType> template<class ThermoSolidType>

27
src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
View File

@ -104,8 +104,7 @@ void Foam::solidMixtureThermo<MixtureType>::correct()
template<class MixtureType> template<class MixtureType>
const Foam::volScalarField& const Foam::volScalarField& Foam::solidMixtureThermo<MixtureType>::K() const
Foam::solidMixtureThermo<MixtureType>::K() const
{ {
return K_; return K_;
} }
@ -220,8 +219,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf() const
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::rho
Foam::solidMixtureThermo<MixtureType>::rho
( (
const label patchI const label patchI
) const ) const
@ -243,8 +241,7 @@ Foam::solidMixtureThermo<MixtureType>::rho
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Cp
Foam::solidMixtureThermo<MixtureType>::Cp
( (
const label patchI const label patchI
) const ) const
@ -266,8 +263,7 @@ Foam::solidMixtureThermo<MixtureType>::Cp
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::hs
Foam::solidMixtureThermo<MixtureType>::hs
( (
const label patchI const label patchI
) const ) const
@ -289,8 +285,7 @@ Foam::solidMixtureThermo<MixtureType>::hs
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
Foam::solidMixtureThermo<MixtureType>::K
( (
const label patchI const label patchI
) const ) const
@ -312,8 +307,7 @@ Foam::solidMixtureThermo<MixtureType>::K
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Hf
Foam::solidMixtureThermo<MixtureType>::Hf
( (
const label patchI const label patchI
) const ) const
@ -335,8 +329,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::sigmaS
Foam::solidMixtureThermo<MixtureType>::sigmaS
( (
const label patchI const label patchI
) const ) const
@ -359,8 +352,7 @@ Foam::solidMixtureThermo<MixtureType>::sigmaS
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
Foam::solidMixtureThermo<MixtureType>::kappa
( (
const label patchI const label patchI
) const ) const
@ -383,8 +375,7 @@ Foam::solidMixtureThermo<MixtureType>::kappa
template<class MixtureType> template<class MixtureType>
Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::emissivity
Foam::solidMixtureThermo<MixtureType>::emissivity
( (
const label patchI const label patchI
) const ) const

7
src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
View File

@ -43,7 +43,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class solidMixtureThermo Declaration Class solidMixtureThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class MixtureType> template<class MixtureType>
@ -81,8 +81,7 @@ public:
//- Destructor //- Destructor
virtual ~solidMixtureThermo();
virtual ~solidMixtureThermo();
// Member functions // Member functions
@ -148,13 +147,11 @@ public:
virtual tmp<scalarField> emissivity(const label patchI) const; virtual tmp<scalarField> emissivity(const label patchI) const;
//- Read thermophysicalProperties dictionary //- Read thermophysicalProperties dictionary
virtual bool read(); virtual bool read();
//- Write the basicSolidThermo properties //- Write the basicSolidThermo properties
virtual bool writeData(Ostream& os) const; virtual bool writeData(Ostream& os) const;
}; };

21
src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
View File

@ -73,17 +73,16 @@ Foam::autoPtr<Foam::pointSolidMixture> Foam::pointSolidMixture::New
const dictionary& thermophysicalProperties const dictionary& thermophysicalProperties
) )
{ {
return autoPtr<pointSolidMixture>(new return autoPtr<pointSolidMixture>
pointSolidMixture(thermophysicalProperties)); (
new pointSolidMixture(thermophysicalProperties)
);
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::scalarField Foam::pointSolidMixture::X Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const
(
const scalarField& Y
) const
{ {
scalarField X(Y.size()); scalarField X(Y.size());
scalar rhoInv = 0.0; scalar rhoInv = 0.0;
@ -97,10 +96,7 @@ Foam::scalarField Foam::pointSolidMixture::X
} }
Foam::scalar Foam::pointSolidMixture::rho Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const
(
const scalarField& X
) const
{ {
scalar val = 0.0; scalar val = 0.0;
forAll(properties_, i) forAll(properties_, i)
@ -111,10 +107,7 @@ Foam::scalar Foam::pointSolidMixture::rho
} }
Foam::scalar Foam::pointSolidMixture::Cp Foam::scalar Foam::pointSolidMixture::Cp(const scalarField& Y) const
(
const scalarField& Y
) const
{ {
scalar val = 0.0; scalar val = 0.0;
forAll(properties_, i) forAll(properties_, i)

2
src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
View File

@ -55,7 +55,7 @@ Ostream& operator<<
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class pointSolid Declaration Class pointSolid Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class pointSolid class pointSolid