Commit 5f9d20e1 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: add Foam:: qualifier to some method names

parent 85bae179
......@@ -26,15 +26,11 @@ License
#include "DimensionedField.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type, class GeoMesh>
void DimensionedField<Type, GeoMesh>::readField
void Foam::DimensionedField<Type, GeoMesh>::readField
(
const dictionary& fieldDict,
const word& fieldDictEntry
......@@ -48,7 +44,10 @@ void DimensionedField<Type, GeoMesh>::readField
template<class Type, class GeoMesh>
void DimensionedField<Type, GeoMesh>::readIfPresent(const word& fieldDictEntry)
void Foam::DimensionedField<Type, GeoMesh>::readIfPresent
(
const word& fieldDictEntry
)
{
if
(
......@@ -65,7 +64,7 @@ void DimensionedField<Type, GeoMesh>::readIfPresent(const word& fieldDictEntry)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type, class GeoMesh>
DimensionedField<Type, GeoMesh>::DimensionedField
Foam::DimensionedField<Type, GeoMesh>::DimensionedField
(
const IOobject& io,
const Mesh& mesh,
......@@ -84,7 +83,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type, class GeoMesh>
bool DimensionedField<Type, GeoMesh>::writeData
bool Foam::DimensionedField<Type, GeoMesh>::writeData
(
Ostream& os,
const word& fieldDictEntry
......@@ -107,7 +106,7 @@ bool DimensionedField<Type, GeoMesh>::writeData
template<class Type, class GeoMesh>
bool DimensionedField<Type, GeoMesh>::writeData(Ostream& os) const
bool Foam::DimensionedField<Type, GeoMesh>::writeData(Ostream& os) const
{
return writeData(os, "value");
}
......@@ -116,7 +115,11 @@ bool DimensionedField<Type, GeoMesh>::writeData(Ostream& os) const
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type, class GeoMesh>
Ostream& operator<<(Ostream& os, const DimensionedField<Type, GeoMesh>& df)
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const DimensionedField<Type, GeoMesh>& df
)
{
df.writeData(os);
......@@ -125,7 +128,7 @@ Ostream& operator<<(Ostream& os, const DimensionedField<Type, GeoMesh>& df)
template<class Type, class GeoMesh>
Ostream& operator<<
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const tmp<DimensionedField<Type, GeoMesh> >& tdf
......@@ -138,8 +141,4 @@ Ostream& operator<<
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -28,42 +28,37 @@ License
#include "dictionary.H"
#include "contiguous.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * //
template<class Type>
const char* const Field<Type>::typeName("Field");
const char* const Foam::Field<Type>::typeName("Field");
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Field<Type>::Field()
Foam::Field<Type>::Field()
:
List<Type>()
{}
template<class Type>
Field<Type>::Field(const label size)
Foam::Field<Type>::Field(const label size)
:
List<Type>(size)
{}
template<class Type>
Field<Type>::Field(const label size, const Type& t)
Foam::Field<Type>::Field(const label size, const Type& t)
:
List<Type>(size, t)
{}
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const UList<Type>& mapF,
const labelUList& mapAddressing
......@@ -74,8 +69,9 @@ Field<Type>::Field
map(mapF, mapAddressing);
}
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const tmp<Field<Type> >& tmapF,
const labelUList& mapAddressing
......@@ -88,7 +84,7 @@ Field<Type>::Field
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const UList<Type>& mapF,
const labelListList& mapAddressing,
......@@ -100,8 +96,9 @@ Field<Type>::Field
map(mapF, mapAddressing, mapWeights);
}
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const tmp<Field<Type> >& tmapF,
const labelListList& mapAddressing,
......@@ -115,7 +112,7 @@ Field<Type>::Field
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const UList<Type>& mapF,
const FieldMapper& mapper
......@@ -126,8 +123,9 @@ Field<Type>::Field
map(mapF, mapper);
}
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const tmp<Field<Type> >& tmapF,
const FieldMapper& mapper
......@@ -140,7 +138,7 @@ Field<Type>::Field
template<class Type>
Field<Type>::Field(const Field<Type>& f)
Foam::Field<Type>::Field(const Field<Type>& f)
:
refCount(),
List<Type>(f)
......@@ -148,35 +146,38 @@ Field<Type>::Field(const Field<Type>& f)
template<class Type>
Field<Type>::Field(Field<Type>& f, bool reUse)
Foam::Field<Type>::Field(Field<Type>& f, bool reUse)
:
List<Type>(f, reUse)
{}
template<class Type>
Field<Type>::Field(const Xfer<List<Type> >& f)
Foam::Field<Type>::Field(const Xfer<List<Type> >& f)
:
List<Type>(f)
{}
template<class Type>
Field<Type>::Field(const Xfer<Field<Type> >& f)
Foam::Field<Type>::Field(const Xfer<Field<Type> >& f)
:
List<Type>(f)
{}
#ifndef __GNUC__
// Not needed for clang/gcc
template<class Type>
Field<Type>::Field(const typename Field<Type>::subField& sf)
Foam::Field<Type>::Field(const typename Field<Type>::subField& sf)
:
List<Type>(sf)
{}
#endif
template<class Type>
Field<Type>::Field(const UList<Type>& list)
Foam::Field<Type>::Field(const UList<Type>& list)
:
List<Type>(list)
{}
......@@ -185,7 +186,7 @@ Field<Type>::Field(const UList<Type>& list)
// Construct as copy of tmp<Field>
#ifdef ConstructFromTmp
template<class Type>
Field<Type>::Field(const tmp<Field<Type> >& tf)
Foam::Field<Type>::Field(const tmp<Field<Type> >& tf)
:
List<Type>(const_cast<Field<Type>&>(tf()), tf.isTmp())
{
......@@ -195,14 +196,14 @@ Field<Type>::Field(const tmp<Field<Type> >& tf)
template<class Type>
Field<Type>::Field(Istream& is)
Foam::Field<Type>::Field(Istream& is)
:
List<Type>(is)
{}
template<class Type>
Field<Type>::Field
Foam::Field<Type>::Field
(
const word& keyword,
const dictionary& dict,
......@@ -285,7 +286,7 @@ Field<Type>::Field
template<class Type>
tmp<Field<Type> > Field<Type>::clone() const
Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::clone() const
{
return tmp<Field<Type> >(new Field<Type>(*this));
}
......@@ -294,7 +295,7 @@ tmp<Field<Type> > Field<Type>::clone() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const UList<Type>& mapF,
const labelUList& mapAddressing
......@@ -323,7 +324,7 @@ void Field<Type>::map
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const tmp<Field<Type> >& tmapF,
const labelUList& mapAddressing
......@@ -335,7 +336,7 @@ void Field<Type>::map
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const UList<Type>& mapF,
const labelListList& mapAddressing,
......@@ -378,8 +379,9 @@ void Field<Type>::map
}
}
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const tmp<Field<Type> >& tmapF,
const labelListList& mapAddressing,
......@@ -392,7 +394,7 @@ void Field<Type>::map
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const UList<Type>& mapF,
const FieldMapper& mapper
......@@ -413,8 +415,9 @@ void Field<Type>::map
}
}
template<class Type>
void Field<Type>::map
void Foam::Field<Type>::map
(
const tmp<Field<Type> >& tmapF,
const FieldMapper& mapper
......@@ -426,7 +429,7 @@ void Field<Type>::map
template<class Type>
void Field<Type>::autoMap
void Foam::Field<Type>::autoMap
(
const FieldMapper& mapper
)
......@@ -452,7 +455,7 @@ void Field<Type>::autoMap
template<class Type>
void Field<Type>::rmap
void Foam::Field<Type>::rmap
(
const UList<Type>& mapF,
const labelUList& mapAddressing
......@@ -471,8 +474,9 @@ void Field<Type>::rmap
}
}
template<class Type>
void Field<Type>::rmap
void Foam::Field<Type>::rmap
(
const tmp<Field<Type> >& tmapF,
const labelUList& mapAddressing
......@@ -484,7 +488,7 @@ void Field<Type>::rmap
template<class Type>
void Field<Type>::rmap
void Foam::Field<Type>::rmap
(
const UList<Type>& mapF,
const labelUList& mapAddressing,
......@@ -501,8 +505,9 @@ void Field<Type>::rmap
}
}
template<class Type>
void Field<Type>::rmap
void Foam::Field<Type>::rmap
(
const tmp<Field<Type> >& tmapF,
const labelUList& mapAddressing,
......@@ -515,14 +520,15 @@ void Field<Type>::rmap
template<class Type>
void Field<Type>::negate()
void Foam::Field<Type>::negate()
{
TFOR_ALL_F_OP_OP_F(Type, *this, =, -, Type, *this)
}
template<class Type>
tmp<Field<typename Field<Type>::cmptType> > Field<Type>::component
Foam::tmp<Foam::Field<typename Foam::Field<Type>::cmptType> >
Foam::Field<Type>::component
(
const direction d
) const
......@@ -534,7 +540,7 @@ tmp<Field<typename Field<Type>::cmptType> > Field<Type>::component
template<class Type>
void Field<Type>::replace
void Foam::Field<Type>::replace
(
const direction d,
const UList<cmptType>& sf
......@@ -546,7 +552,7 @@ void Field<Type>::replace
template<class Type>
void Field<Type>::replace
void Foam::Field<Type>::replace
(
const direction d,
const tmp<Field<cmptType> >& tsf
......@@ -558,7 +564,7 @@ void Field<Type>::replace
template<class Type>
void Field<Type>::replace
void Foam::Field<Type>::replace
(
const direction d,
const cmptType& c
......@@ -570,7 +576,7 @@ void Field<Type>::replace
template<class Type>
tmp<Field<Type> > Field<Type>::T() const
Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::T() const
{
tmp<Field<Type> > transpose(new Field<Type>(this->size()));
::Foam::T(transpose(), *this);
......@@ -579,7 +585,7 @@ tmp<Field<Type> > Field<Type>::T() const
template<class Type>
void Field<Type>::writeEntry(const word& keyword, Ostream& os) const
void Foam::Field<Type>::writeEntry(const word& keyword, Ostream& os) const
{
os.writeKeyword(keyword);
......@@ -617,7 +623,7 @@ void Field<Type>::writeEntry(const word& keyword, Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type>
void Field<Type>::operator=(const Field<Type>& rhs)
void Foam::Field<Type>::operator=(const Field<Type>& rhs)
{
if (this == &rhs)
{
......@@ -631,21 +637,21 @@ void Field<Type>::operator=(const Field<Type>& rhs)
template<class Type>
void Field<Type>::operator=(const SubField<Type>& rhs)
void Foam::Field<Type>::operator=(const SubField<Type>& rhs)
{
List<Type>::operator=(rhs);
}
template<class Type>
void Field<Type>::operator=(const UList<Type>& rhs)
void Foam::Field<Type>::operator=(const UList<Type>& rhs)
{
List<Type>::operator=(rhs);
}
template<class Type>
void Field<Type>::operator=(const tmp<Field>& rhs)
void Foam::Field<Type>::operator=(const tmp<Field>& rhs)
{
if (this == &(rhs()))
{
......@@ -662,7 +668,7 @@ void Field<Type>::operator=(const tmp<Field>& rhs)
template<class Type>
void Field<Type>::operator=(const Type& t)
void Foam::Field<Type>::operator=(const Type& t)
{
List<Type>::operator=(t);
}
......@@ -670,7 +676,7 @@ void Field<Type>::operator=(const Type& t)
template<class Type>
template<class Form, class Cmpt, int nCmpt>
void Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
void Foam::Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
{
typedef VectorSpace<Form,Cmpt,nCmpt> VSType;
TFOR_ALL_F_OP_S(Type, *this, =, VSType, vs)
......@@ -680,20 +686,20 @@ void Field<Type>::operator=(const VectorSpace<Form,Cmpt,nCmpt>& vs)
#define COMPUTED_ASSIGNMENT(TYPE, op) \
\
template<class Type> \
void Field<Type>::operator op(const UList<TYPE>& f) \
void Foam::Field<Type>::operator op(const UList<TYPE>& f) \
{ \
TFOR_ALL_F_OP_F(Type, *this, op, TYPE, f) \
} \
\
template<class Type> \
void Field<Type>::operator op(const tmp<Field<TYPE> >& tf) \
void Foam::Field<Type>::operator op(const tmp<Field<TYPE> >& tf) \
{ \
operator op(tf()); \
tf.clear(); \
} \
\
template<class Type> \
void Field<Type>::operator op(const TYPE& t) \
void Foam::Field<Type>::operator op(const TYPE& t) \
{ \
TFOR_ALL_F_OP_S(Type, *this, op, TYPE, t) \
}
......@@ -709,17 +715,17 @@ COMPUTED_ASSIGNMENT(scalar, /=)
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
template<class Type>
Ostream& operator<<(Ostream& os, const Field<Type>& f)
Foam::Ostream& Foam::operator<<(Ostream& os, const Field<Type>& f)
{
os << static_cast<const List<Type>&>(f);
os << static_cast<const List<Type>&>(f);
return os;
}
template<class Type>
Ostream& operator<<(Ostream& os, const tmp<Field<Type> >& tf)
Foam::Ostream& Foam::operator<<(Ostream& os, const tmp<Field<Type> >& tf)
{
os << tf();
os << tf();
tf.clear();
return os;
}
......@@ -727,10 +733,6 @@ Ostream& operator<<(Ostream& os, const tmp<Field<Type> >& tf)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
# include "FieldFunctions.C"
#include "FieldFunctions.C"
// ************************************************************************* //
......@@ -27,15 +27,11 @@ License
#include "transformField.H"
#include "symmTransformField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
Foam::basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
......@@ -46,7 +42,7 @@ basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
template<class Type>
basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
Foam::basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
......@@ -58,7 +54,7 @@ basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
template<class Type>
basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
Foam::basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
(
const basicSymmetryPointPatchField<Type>& ptf,
const pointPatch& p,
......@@ -71,7 +67,7 @@ basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
template<class Type>
basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
Foam::basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
(
const basicSymmetryPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
......@@ -84,7 +80,10 @@ basicSymmetryPointPatchField<Type>::basicSymmetryPointPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
void basicSymmetryPointPatchField<Type>::evaluate(const Pstream::commsTypes)
void Foam::basicSymmetryPointPatchField<Type>::evaluate
(
const Pstream::commsTypes
)
{
const vectorField& nHat = this->patch().pointNormals();
......@@ -103,8 +102,4 @@ void basicSymmetryPointPatchField<Type>::evaluate(const Pstream::commsTypes)
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //
......@@ -26,15 +26,11 @@ License
#include "mixedPointPatchField.H"
#include "pointPatchFieldMapper.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void mixedPointPatchField<Type>::checkFieldSize() const
void Foam::mixedPointPatchField<Type>::checkFieldSize() const
{
if