songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

general cleaning up for warning messages generated by gcc 4.3.0

Browse Source
This commit is contained in:
andy 2008-06-02 19:27:48 +01:00
parent daca3b3300
commit f2a13e6d7d
17 changed files with 113 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
View File

@ -298,7 +298,7 @@ public:
inline const word& cloudType() const;
//- Return the parcel type id
inline const label parcelTypeId() const;
inline label parcelTypeId() const;
//- Return refernce to the mesh
inline const fvMesh& mesh() const;
@ -316,10 +316,10 @@ public:
inline Random& rndGen();
//- Return the start of injection interval time
inline const scalar time0() const;
inline scalar time0() const;
//- Return a reference to the mass of particles to introduce
inline const scalar massTotal() const;
inline scalar massTotal() const;
// References to the carrier gas fields
@ -398,10 +398,10 @@ public:
// Check
//- Total mass injected
inline const scalar massInjected() const;
inline scalar massInjected() const;
//- Total mass in system
inline const scalar massInSystem() const;
inline scalar massInSystem() const;
//- Print cloud information
void info() const;
@ -413,10 +413,10 @@ public:
// Counters
//- Return the number of injections
inline const label nInjections() const;
inline label nInjections() const;
//- Return the total number parcels added
inline const label nParcelsAddedTotal() const;
inline label nParcelsAddedTotal() const;
// Fields

14
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -34,7 +34,7 @@ inline const Foam::word& Foam::KinematicCloud<ParcelType>::cloudType() const
template<class ParcelType>
inline const Foam::label Foam::KinematicCloud<ParcelType>::parcelTypeId() const
inline Foam::label Foam::KinematicCloud<ParcelType>::parcelTypeId() const
{
return parcelTypeId_;
}
@ -164,42 +164,42 @@ Foam::KinematicCloud<ParcelType>::UIntegrator() const
template<class ParcelType>
inline const Foam::label Foam::KinematicCloud<ParcelType>::nInjections() const
inline Foam::label Foam::KinematicCloud<ParcelType>::nInjections() const
{
return nInjections_;
}
template<class ParcelType>
inline const Foam::label Foam::KinematicCloud<ParcelType>::nParcelsAddedTotal() const
inline Foam::label Foam::KinematicCloud<ParcelType>::nParcelsAddedTotal() const
{
return nParcelsAddedTotal_;
}
template<class ParcelType>
inline const Foam::scalar Foam::KinematicCloud<ParcelType>::time0() const
inline Foam::scalar Foam::KinematicCloud<ParcelType>::time0() const
{
return time0_;
}
template<class ParcelType>
inline const Foam::scalar Foam::KinematicCloud<ParcelType>::massTotal() const
inline Foam::scalar Foam::KinematicCloud<ParcelType>::massTotal() const
{
return massTotal_;
}
template<class ParcelType>
inline const Foam::scalar Foam::KinematicCloud<ParcelType>::massInjected() const
inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInjected() const
{
return massInjected_;
}
template<class ParcelType>
inline const Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
{
scalar sysMass = 0.0;
forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)

2
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
View File

@ -175,7 +175,7 @@ public:
// Modelling options
//- Radiation flag
inline const bool radiation() const;
inline bool radiation() const;
// Sources

2
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -61,7 +61,7 @@ Foam::ThermoCloud<ParcelType>::TIntegrator() const
template<class ParcelType>
inline const bool Foam::ThermoCloud<ParcelType>::radiation() const
inline bool Foam::ThermoCloud<ParcelType>::radiation() const
{
return radiation_;
}

14
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
View File

@ -101,10 +101,10 @@ public:
// Member functions
//- Return const access to the particle density
inline const scalar rho0() const;
inline scalar rho0() const;
//- Return const access to the minimum particle mass
inline const scalar minParticleMass() const;
inline scalar minParticleMass() const;
};
@ -275,10 +275,10 @@ public:
// Access
//- Return type id
inline const label typeId() const;
inline label typeId() const;
//- Return const access to diameter
inline const scalar d() const;
inline scalar d() const;
//- Return const access to velocity
inline const vector& U() const;
@ -287,13 +287,13 @@ public:
inline const vector& Ur() const;
//- Return const access to number of particles
inline const scalar nParticle() const;
inline scalar nParticle() const;
//- Return const access to density
inline const scalar rho() const;
inline scalar rho() const;
//- Return const access to time spent in turbulent eddy
inline const scalar tTurb() const;
inline scalar tTurb() const;
//- Return const access to turbulent velocity fluctuation
inline const vector& UTurb() const;

14
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
View File

@ -88,7 +88,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
{
return rho0_;
@ -96,7 +96,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
{
return minParticleMass_;
@ -156,14 +156,14 @@ Foam::KinematicParcel<ParcelType>::trackData::g() const
// * * * * * * * * * * KinematicParcel Member Functions * * * * * * * * * * //
template <class ParcelType>
inline const Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
inline Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
{
return typeId_;
}
template <class ParcelType>
inline const Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
{
return d_;
}
@ -216,7 +216,7 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
template <class ParcelType>
inline const Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
{
return nParticle_;
}
@ -230,7 +230,7 @@ inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
template <class ParcelType>
inline const Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
{
return rho_;
}
@ -244,7 +244,7 @@ inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
template <class ParcelType>
inline const Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
{
return tTurb_;
}

12
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
View File

@ -95,11 +95,13 @@ public:
//- Constructor
constantProperties(const dictionary& dict);
//- Return const access to the vapourisation temperature
inline const scalar Tvap() const;
// Access
//- Return const access to the boiling point
inline const scalar Tbp() const;
//- Return const access to the vapourisation temperature
inline scalar Tvap() const;
//- Return const access to the boiling point
inline scalar Tbp() const;
};
@ -272,7 +274,7 @@ public:
inline const scalarField& YMixture() const;
//- Return const access to initial mass
inline const scalar mass0() const;
inline scalar mass0() const;
// Edit

6
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
View File

@ -112,7 +112,7 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template<class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
{
return Tvap_;
@ -120,7 +120,7 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
template<class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
{
return Tbp_;
@ -212,7 +212,7 @@ inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture()
template<class ParcelType>
inline const Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
{
return mass0_;
}

21
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
View File

@ -105,10 +105,19 @@ public:
// Access
inline const scalar T0() const;
inline const scalar cp0() const;
inline const scalar epsilon0() const;
inline const scalar f0() const;
//- Return const access to particle initial temperature [K]
inline scalar T0() const;
//- Return const access to particle specific heat capacity
// [J/(kg.K)]
inline scalar cp0() const;
//- Return const access to Particle emissivity [] (radiation)
inline scalar epsilon0() const;
//- Return const access to Particle scattering factor []
// (radiation)
inline scalar f0() const;
};
@ -250,10 +259,10 @@ public:
// Access
//- Return const access to temperature
inline const scalar T() const;
inline scalar T() const;
//- Return const access to specific heat capacity
inline const scalar cp() const;
inline scalar cp() const;
// Edit

12
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
View File

@ -103,7 +103,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
{
return T0_;
@ -111,7 +111,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::cp0() const
{
return cp0_;
@ -119,7 +119,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::cp0() const
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::epsilon0() const
{
return epsilon0_;
@ -127,7 +127,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::epsilon0() const
template <class ParcelType>
inline const Foam::scalar
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::f0() const
{
return f0_;
@ -171,7 +171,7 @@ Foam::ThermoParcel<ParcelType>::trackData::cpInterp() const
// * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
template<class ParcelType>
inline const Foam::scalar Foam::ThermoParcel<ParcelType>::T() const
inline Foam::scalar Foam::ThermoParcel<ParcelType>::T() const
{
return T_;
}
@ -185,7 +185,7 @@ inline Foam::scalar& Foam::ThermoParcel<ParcelType>::T()
template<class ParcelType>
inline const Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
inline Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
{
return cp_;
}

2
src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
View File

@ -63,7 +63,7 @@ const Foam::dictionary& Foam::DragModel<CloudType>::dict() const
template<class CloudType>
const Foam::scalar Foam::DragModel<CloudType>::Cu
Foam::scalar Foam::DragModel<CloudType>::Cu
(
const vector& Ur,
const scalar d,

2
src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
View File

@ -126,7 +126,7 @@ public:
//- Return linearised coefficient for velocity equation
// Drag force per unit particle mass = Cu(U - Up)
const scalar Cu
scalar Cu
(
const vector& Ur,
const scalar d,

10
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
View File

@ -84,35 +84,35 @@ const Foam::dictionary& Foam::InjectionModel<CloudType>::coeffDict() const
template<class CloudType>
const Foam::scalar Foam::InjectionModel<CloudType>::timeStart() const
Foam::scalar Foam::InjectionModel<CloudType>::timeStart() const
{
return SOI_;
}
template<class CloudType>
const Foam::scalar Foam::InjectionModel<CloudType>::volumeTotal() const
Foam::scalar Foam::InjectionModel<CloudType>::volumeTotal() const
{
return volumeTotal_;
}
template<class CloudType>
const Foam::label Foam::InjectionModel<CloudType>::nParcels() const
Foam::label Foam::InjectionModel<CloudType>::nParcels() const
{
return nParcels_;
}
template<class CloudType>
const Foam::scalar Foam::InjectionModel<CloudType>::volume() const
Foam::scalar Foam::InjectionModel<CloudType>::volume() const
{
return volume_;
}
template<class CloudType>
const Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction() const
Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction() const
{
return volume_/volumeTotal_;
}

10
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
View File

@ -178,10 +178,10 @@ public:
// Global information
//- Return the start-of-injection time
const scalar timeStart() const;
scalar timeStart() const;
//- Return the total volume to be injected across the event
const scalar volumeTotal() const;
scalar volumeTotal() const;
//- Return the end-of-injection time
virtual scalar timeEnd() const = 0;
@ -197,13 +197,13 @@ public:
);
//- Return the number of parcels to introduce
const label nParcels() const;
label nParcels() const;
//- Return the volume of parcels to introduce
const scalar volume() const;
scalar volume() const;
//- Return the volume fraction to introduce
const scalar volumeFraction() const;
scalar volumeFraction() const;
// Injection geometry

10
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
View File

@ -207,24 +207,24 @@ public:
virtual const scalarField& YMixture0() const = 0;
//- Return the gas constant for the gas mixture
virtual const scalar RGas(const scalarField& YGas) const = 0;
virtual scalar RGas(const scalarField& YGas) const = 0;
//- Return enthalpy for the gas mixture
virtual const scalar HGas
virtual scalar HGas
(
const scalarField& YGas,
const scalar T
) const = 0;
//- Return specific heat caparcity for the gas mixture
virtual const scalar cpGas
virtual scalar cpGas
(
const scalarField& YGas,
const scalar T
) const = 0;
//- Return specific heat caparcity for the liquid mixture
virtual const scalar cpLiquid
virtual scalar cpLiquid
(
const scalarField& YLiquid,
const scalar p,
@ -232,7 +232,7 @@ public:
) const = 0;
//- Return specific heat caparcity for the solid mixture
virtual const scalar cpSolid
virtual scalar cpSolid
(
const scalarField& YSolid
) const = 0;

49
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
View File

@ -307,8 +307,7 @@ Foam::SingleMixtureFraction<CloudType>::YGas0() const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::YGasTot0() const
Foam::scalar Foam::SingleMixtureFraction<CloudType>::YGasTot0() const
{
return YGasTot0_;
}
@ -323,8 +322,10 @@ Foam::SingleMixtureFraction<CloudType>::liquidNames() const
template<class CloudType>
Foam::label
Foam::SingleMixtureFraction<CloudType>::liquidLocalId(const word& liquidName) const
Foam::label Foam::SingleMixtureFraction<CloudType>::liquidLocalId
(
const word& liquidName
) const
{
forAll(liquidNames_, i)
{
@ -346,8 +347,10 @@ Foam::SingleMixtureFraction<CloudType>::liquidLocalId(const word& liquidName) co
template<class CloudType>
Foam::label
Foam::SingleMixtureFraction<CloudType>::liquidGlobalId(const word& liquidName) const
Foam::label Foam::SingleMixtureFraction<CloudType>::liquidGlobalId
(
const word& liquidName
) const
{
forAll(liquidNames_, i)
{
@ -385,8 +388,7 @@ Foam::SingleMixtureFraction<CloudType>::YLiquid0() const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::YLiquidTot0() const
Foam::scalar Foam::SingleMixtureFraction<CloudType>::YLiquidTot0() const
{
return YLiquidTot0_;
}
@ -401,8 +403,10 @@ Foam::SingleMixtureFraction<CloudType>::solidNames() const
template<class CloudType>
Foam::label
Foam::SingleMixtureFraction<CloudType>::solidLocalId(const word& solidName) const
Foam::label Foam::SingleMixtureFraction<CloudType>::solidLocalId
(
const word& solidName
) const
{
forAll(solidNames_, i)
{
@ -425,7 +429,10 @@ Foam::SingleMixtureFraction<CloudType>::solidLocalId(const word& solidName) cons
template<class CloudType>
Foam::label
Foam::SingleMixtureFraction<CloudType>::solidGlobalId(const word& solidName) const
Foam::SingleMixtureFraction<CloudType>::solidGlobalId
(
const word& solidName
) const
{
forAll(solidNames_, i)
{
@ -463,7 +470,7 @@ Foam::SingleMixtureFraction<CloudType>::YSolid0() const
template<class CloudType>
const Foam::scalar
Foam::scalar
Foam::SingleMixtureFraction<CloudType>::YSolidTot0() const
{
return YSolidTot0_;
@ -479,8 +486,10 @@ Foam::SingleMixtureFraction<CloudType>::YMixture0() const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::RGas(const scalarField& YGas) const
Foam::scalar Foam::SingleMixtureFraction<CloudType>::RGas
(
const scalarField& YGas
) const
{
scalar RGasMixture = 0.0;
forAll(YGas, i)
@ -493,8 +502,7 @@ Foam::SingleMixtureFraction<CloudType>::RGas(const scalarField& YGas) const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::HGas
Foam::scalar Foam::SingleMixtureFraction<CloudType>::HGas
(
const scalarField& YGas,
const scalar T
@ -512,8 +520,7 @@ const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::cpGas
Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpGas
(
const scalarField& YGas,
const scalar T
@ -531,8 +538,7 @@ const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::cpLiquid
Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpLiquid
(
const scalarField& YLiquid,
const scalar p,
@ -552,8 +558,7 @@ const
template<class CloudType>
const Foam::scalar
Foam::SingleMixtureFraction<CloudType>::cpSolid
Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpSolid
(
const scalarField& YSolid
)

16
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
View File

@ -156,7 +156,7 @@ public:
const scalarField& YGas0() const;
//- Return the total gas mass fraction
const scalar YGasTot0() const;
scalar YGasTot0() const;
//- Return the list of liquid names
const wordList& liquidNames() const;
@ -168,7 +168,7 @@ public:
const scalarField& YLiquid0() const;
//- Return the total liquid mass fraction
const scalar YLiquidTot0() const;
scalar YLiquidTot0() const;
//- Return the list of solid names
const wordList& solidNames() const;
@ -180,22 +180,22 @@ public:
const scalarField& YSolid0() const;
//- Return the total solid mass fraction
const scalar YSolidTot0() const;
scalar YSolidTot0() const;
//- Return the list of mixture mass fractions
const scalarField& YMixture0() const;
//- Return the gas constant for the gas mixture
const scalar RGas(const scalarField& YGas) const;
scalar RGas(const scalarField& YGas) const;
//- Return enthalpy for the gas mixture
const scalar HGas(const scalarField& YGas, const scalar T) const;
scalar HGas(const scalarField& YGas, const scalar T) const;
//- Return specific heat caparcity for the gas mixture
const scalar cpGas(const scalarField& YGas, const scalar T) const;
scalar cpGas(const scalarField& YGas, const scalar T) const;
//- Return specific heat caparcity for the liquid mixture
const scalar cpLiquid
scalar cpLiquid
(
const scalarField& YLiquid,
const scalar p,
@ -203,7 +203,7 @@ public:
) const;
//- Return specific heat caparcity for the solid mixture
const scalar cpSolid(const scalarField& YSolid) const;
scalar cpSolid(const scalarField& YSolid) const;
};