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

COMP: add 'this->' qualifier to find methods in base case

Browse Source
This commit is contained in:
Mark Olesen
2010-12-17 15:39:50 +01:00
parent 90ea219f77
commit 9224daad7b
48 changed files with 164 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
View File

@ -47,7 +47,7 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
{
for (const_iterator iter = ht.begin(); iter != ht.end(); ++iter)
{
insert(iter.key(), new T(**iter));
this->insert(iter.key(), new T(**iter));
}
}
@ -129,11 +129,11 @@ void Foam::HashPtrTable<T, Key, Hash>::operator=
<< abort(FatalError);
}
clear();
this->clear();
for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
{
insert(iter.key(), new T(**iter));
this->insert(iter.key(), new T(**iter));
}
}

2
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
View File

@ -98,7 +98,7 @@ public:
//- Construct from dictionary using default dictionary constructor
// class
HashPtrTable(const dictionary& dict);
HashPtrTable(const dictionary&);
//- Construct as copy
HashPtrTable(const HashPtrTable<T, Key, Hash>&);

16
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
View File

@ -65,7 +65,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
{
Key key;
is >> key;
insert(key, inewt(key, is).ptr());
this->insert(key, inewt(key, is).ptr());
is.fatalCheck
(
@ -112,7 +112,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
is.putBack(lastToken);
Key key;
is >> key;
insert(key, inewt(key, is).ptr());
this->insert(key, inewt(key, is).ptr());
is.fatalCheck
(
@ -148,7 +148,11 @@ void Foam::HashPtrTable<T, Key, Hash>::read
{
forAllConstIter(dictionary, dict, iter)
{
insert(iter().keyword(), inewt(dict.subDict(iter().keyword())).ptr());
this->insert
(
iter().keyword(),
inewt(dict.subDict(iter().keyword())).ptr()
);
}
}
@ -177,21 +181,21 @@ template<class T, class Key, class Hash>
template<class INew>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is, const INew& inewt)
{
read(is, inewt);
this->read(is, inewt);
}
template<class T, class Key, class Hash>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
{
read(is, INew<T>());
this->read(is, INew<T>());
}
template<class T, class Key, class Hash>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const dictionary& dict)
{
read(dict, INew<T>());
this->read(dict, INew<T>());
}

22
src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
View File

@ -37,7 +37,7 @@ Foam::HashSet<Key, Hash>::HashSet(const UList<Key>& lst)
{
forAll(lst, elemI)
{
insert(lst[elemI]);
this->insert(lst[elemI]);
}
}
@ -59,7 +59,7 @@ Foam::HashSet<Key, Hash>::HashSet
++cit
)
{
insert(cit.key());
this->insert(cit.key());
}
}
@ -72,7 +72,7 @@ Foam::label Foam::HashSet<Key, Hash>::insert(const UList<Key>& lst)
label count = 0;
forAll(lst, elemI)
{
if (insert(lst[elemI]))
if (this->insert(lst[elemI]))
{
++count;
}
@ -87,7 +87,7 @@ Foam::label Foam::HashSet<Key, Hash>::insert(const UList<Key>& lst)
template<class Key, class Hash>
inline bool Foam::HashSet<Key, Hash>::operator[](const Key& key) const
{
return found(key);
return this->found(key);
}
@ -106,7 +106,7 @@ bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
// Are all rhs elements in lhs?
for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
{
if (!found(iter.key()))
if (!this->found(iter.key()))
{
return false;
}
@ -129,7 +129,7 @@ void Foam::HashSet<Key, Hash>::operator|=(const HashSet<Key, Hash>& rhs)
// Add rhs elements into lhs
for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
{
insert(iter.key());
this->insert(iter.key());
}
}
@ -142,7 +142,7 @@ void Foam::HashSet<Key, Hash>::operator&=(const HashSet<Key, Hash>& rhs)
{
if (!rhs.found(iter.key()))
{
erase(iter);
this->erase(iter);
}
}
}
@ -154,13 +154,13 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
// Add missed rhs elements, remove duplicate elements
for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
{
if (found(iter.key()))
if (this->found(iter.key()))
{
erase(iter.key());
this->erase(iter.key());
}
else
{
insert(iter.key());
this->insert(iter.key());
}
}
}
@ -173,7 +173,7 @@ void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
// Remove rhs elements from lhs
for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
{
erase(iter.key());
this->erase(iter.key());
}
}

8
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C
View File

@ -39,7 +39,7 @@ Foam::ILList<LListBase, T>::ILList(const ILList<LListBase, T>& lst)
++iter
)
{
append(iter().clone().ptr());
this->append(iter().clone().ptr());
}
}
@ -62,7 +62,7 @@ Foam::ILList<LListBase, T>::ILList
++iter
)
{
append(iter().clone(cloneArg).ptr());
this->append(iter().clone(cloneArg).ptr());
}
}
#endif
@ -114,7 +114,7 @@ template<class LListBase, class T>
void Foam::ILList<LListBase, T>::clear()
{
label oldSize = this->size();
for (label i=0; i<oldSize; i++)
for (label i=0; i<oldSize; ++i)
{
eraseHead();
}
@ -145,7 +145,7 @@ void Foam::ILList<LListBase, T>::operator=(const ILList<LListBase, T>& lst)
++iter
)
{
append(iter().clone().ptr());
this->append(iter().clone().ptr());
}
}

18
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
View File

@ -53,9 +53,9 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
{
if (delimiter == token::BEGIN_LIST)
{
for (label i=0; i<s; i++)
for (label i=0; i<s; ++i)
{
append(iNew(is).ptr());
this->append(iNew(is).ptr());
is.fatalCheck
(
@ -67,7 +67,7 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
else
{
T* tPtr = iNew(is).ptr();
append(tPtr);
this->append(tPtr);
is.fatalCheck
(
@ -75,9 +75,9 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
"reading entry"
);
for (label i=1; i<s; i++)
for (label i=1; i<s; ++i)
{
append(new T(*tPtr));
this->append(new T(*tPtr));
}
}
}
@ -109,7 +109,7 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
)
{
is.putBack(lastToken);
append(iNew(is).ptr());
this->append(iNew(is).ptr());
is >> lastToken;
is.fatalCheck("operator>>(Istream&, ILList<LListBase, T>&)");
@ -131,14 +131,14 @@ template<class LListBase, class T>
template<class INew>
Foam::ILList<LListBase, T>::ILList(Istream& is, const INew& iNew)
{
read(is, iNew);
this->read(is, iNew);
}
template<class LListBase, class T>
Foam::ILList<LListBase, T>::ILList(Istream& is)
{
read(is, INew<T>());
this->read(is, INew<T>());
}
@ -154,6 +154,4 @@ Foam::Istream& Foam::operator>>(Istream& is, ILList<LListBase, T>& L)
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

8
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.C
View File

@ -35,7 +35,7 @@ Foam::LList<LListBase, T>::LList(const LList<LListBase, T>& lst)
{
for (const_iterator iter = lst.begin(); iter != lst.end(); ++iter)
{
append(iter());
this->append(iter());
}
}
@ -53,9 +53,9 @@ template<class LListBase, class T>
void Foam::LList<LListBase, T>::clear()
{
label oldSize = this->size();
for (label i=0; i<oldSize; i++)
for (label i=0; i<oldSize; ++i)
{
removeHead();
this->removeHead();
}
LListBase::clear();
@ -79,7 +79,7 @@ void Foam::LList<LListBase, T>::operator=(const LList<LListBase, T>& lst)
for (const_iterator iter = lst.begin(); iter != lst.end(); ++iter)
{
append(iter());
this->append(iter());
}
}

15
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
View File

@ -238,10 +238,7 @@ public:
public:
//- Construct from base iterator
iterator
(
LListBase_iterator baseIter
)
iterator(LListBase_iterator baseIter)
:
LListBase_iterator(baseIter)
{}
@ -282,20 +279,14 @@ public:
public:
//- Construct from base const_iterator
const_iterator
(
LListBase_const_iterator baseIter
)
const_iterator(LListBase_const_iterator baseIter)
:
LListBase_const_iterator(baseIter)
{}
//- Construct from base iterator
const_iterator
(
LListBase_iterator baseIter
)
const_iterator(LListBase_iterator baseIter)
:
LListBase_const_iterator(baseIter)
{}

4
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
View File

@ -64,7 +64,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& L)
{
if (delimiter == token::BEGIN_LIST)
{
for (register label i=0; i<s; i++)
for (register label i=0; i<s; ++i)
{
T element;
is >> element;
@ -76,7 +76,7 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& L)
T element;
is >> element;
for (register label i=0; i<s; i++)
for (register label i=0; i<s; ++i)
{
L.append(element);
}

10
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.C
View File

@ -34,7 +34,7 @@ Foam::LPtrList<LListBase, T>::LPtrList(const LPtrList<LListBase, T>& lst)
{
for (const_iterator iter = lst.begin(); iter != lst.end(); ++iter)
{
append(iter().clone().ptr());
this->append(iter().clone().ptr());
}
}
@ -44,7 +44,7 @@ Foam::LPtrList<LListBase, T>::LPtrList(const LPtrList<LListBase, T>& lst)
template<class LListBase, class T>
Foam::LPtrList<LListBase, T>::~LPtrList()
{
clear();
this->clear();
}
@ -69,8 +69,8 @@ bool Foam::LPtrList<LListBase, T>::eraseHead()
template<class LListBase, class T>
void Foam::LPtrList<LListBase, T>::clear()
{
label oldSize = this->size();
for (label i=0; i<oldSize; i++)
const label oldSize = this->size();
for (label i=0; i<oldSize; ++i)
{
eraseHead();
}
@ -96,7 +96,7 @@ void Foam::LPtrList<LListBase, T>::operator=(const LPtrList<LListBase, T>& lst)
for (const_iterator iter = lst.begin(); iter != lst.end(); ++iter)
{
append(iter().clone().ptr());
this->append(iter().clone().ptr());
}
}

17
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
View File

@ -75,7 +75,7 @@ class LPtrList
//- Read from Istream using given Istream constructor class
template<class INew>
void read(Istream&, const INew& inewt);
void read(Istream&, const INew&);
public:
@ -188,10 +188,7 @@ public:
public:
//- Construct from base iterator
iterator
(
LListBase_iterator baseIter
)
iterator(LListBase_iterator baseIter)
:
LList<LListBase, T*>::iterator(baseIter)
{}
@ -224,19 +221,13 @@ public:
public:
//- Construct from base const_iterator
const_iterator
(
LListBase_const_iterator baseIter
)
const_iterator(LListBase_const_iterator baseIter)
:
LList<LListBase, T*>::const_iterator(baseIter)
{}
//- Construct from base iterator
const_iterator
(
LListBase_iterator baseIter
)
const_iterator(LListBase_iterator baseIter)
:
LList<LListBase, T*>::const_iterator(baseIter)
{}

14
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
View File

@ -58,9 +58,9 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
{
if (delimiter == token::BEGIN_LIST)
{
for (label i=0; i<s; i++)
for (label i=0; i<s; ++i)
{
append(iNew(is).ptr());
this->append(iNew(is).ptr());
is.fatalCheck
(
@ -72,7 +72,7 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
else
{
T* tPtr = iNew(is).ptr();
append(tPtr);
this->append(tPtr);
is.fatalCheck
(
@ -80,7 +80,7 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
"reading entry"
);
for (label i=1; i<s; i++)
for (label i=1; i<s; ++i)
{
append(tPtr->clone().ptr());
}
@ -114,7 +114,7 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
)
{
is.putBack(lastToken);
append(iNew(is).ptr());
this->append(iNew(is).ptr());
is >> lastToken;
is.fatalCheck
@ -144,14 +144,14 @@ template<class LListBase, class T>
template<class INew>
Foam::LPtrList<LListBase, T>::LPtrList(Istream& is, const INew& iNew)
{
read(is, iNew);
this->read(is, iNew);
}
template<class LListBase, class T>
Foam::LPtrList<LListBase, T>::LPtrList(Istream& is)
{
read(is, INew<T>());
this->read(is, INew<T>());
}

4
src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
View File

@ -32,7 +32,7 @@ Foam::UILList<LListBase, T>::UILList(const UILList<LListBase, T>& lst)
{
for (const_iterator iter = lst.begin(); iter != lst.end(); ++iter)
{
append(&iter());
this->append(&iter());
}
}
@ -46,7 +46,7 @@ void Foam::UILList<LListBase, T>::operator=(const UILList<LListBase, T>& rhs)
for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
{
append(&iter());
this->append(&iter());
}
}

15
src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
View File

@ -181,10 +181,7 @@ public:
public:
//- Construct from base iterator
iterator
(
LListBase_iterator baseIter
)
iterator(LListBase_iterator baseIter)
:
LListBase_iterator(baseIter)
{}
@ -223,19 +220,13 @@ public:
public:
//- Construct from base const_iterator
const_iterator
(
LListBase_const_iterator baseIter
)
const_iterator(LListBase_const_iterator baseIter)
:
LListBase_const_iterator(baseIter)
{}
//- Construct from base iterator
const_iterator
(
LListBase_iterator baseIter
)
const_iterator(LListBase_iterator baseIter)
:
LListBase_const_iterator(baseIter)
{}

1
src/OpenFOAM/containers/LinkedLists/user/FIFOStack.H
View File

@ -26,6 +26,7 @@ Class
Description
A FIFO stack based on a singly-linked list.
Operations are push(), pop(), top(), bottom() and empty().
SourceFiles

1
src/OpenFOAM/containers/LinkedLists/user/LIFOStack.H
View File

@ -26,6 +26,7 @@ Class
Description
A LIFO stack based on a singly-linked list.
Operations are push(), pop(), top(), bottom() and empty().
SourceFiles

2
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
View File

@ -459,7 +459,7 @@ void DimensionedField<Type, GeoMesh>::operator=
checkField(*this, df, "=");
dimensions_ = df.dimensions();
transfer(const_cast<DimensionedField<Type, GeoMesh>&>(df));
this->transfer(const_cast<DimensionedField<Type, GeoMesh>&>(df));
tdf.clear();
}

2
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
View File

@ -39,7 +39,7 @@ void Foam::DimensionedField<Type, GeoMesh>::readField
dimensions_.reset(dimensionSet(fieldDict.lookup("dimensions")));
Field<Type> f(fieldDictEntry, fieldDict, GeoMesh::size(mesh_));
transfer(f);
this->transfer(f);
}

14
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
View File

@ -53,7 +53,7 @@ GeometricBoundaryField
forAll(bmesh_, patchi)
{
set
this->set
(
patchi,
PatchField<Type>::New
@ -112,7 +112,7 @@ GeometricBoundaryField
{
forAll(bmesh_, patchi)
{
set
this->set
(
patchi,
PatchField<Type>::New
@ -129,7 +129,7 @@ GeometricBoundaryField
{
forAll(bmesh_, patchi)
{
set
this->set
(
patchi,
PatchField<Type>::New
@ -167,7 +167,7 @@ GeometricBoundaryField
forAll(bmesh_, patchi)
{
set(patchi, ptfl[patchi].clone(field));
this->set(patchi, ptfl[patchi].clone(field));
}
}
@ -195,7 +195,7 @@ GeometricBoundaryField
forAll(bmesh_, patchi)
{
set(patchi, btf[patchi].clone(field));
this->set(patchi, btf[patchi].clone(field));
}
}
@ -275,7 +275,7 @@ GeometricBoundaryField
<< " to split cyclics." << exit(FatalIOError);
}
set
this->set
(
patchi,
PatchField<Type>::New
@ -288,7 +288,7 @@ GeometricBoundaryField
}
else
{
set
this->set
(
patchi,
PatchField<Type>::New

2
src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
View File

@ -98,7 +98,7 @@ void Foam::basicSymmetryPointPatchField<Type>::evaluate
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, tvalues());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.C
View File

@ -161,7 +161,7 @@ void Foam::mixedPointPatchField<Type>::evaluate(const Pstream::commsTypes)
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, *this);
this->setInInternalField(iF, *this);
}

6
src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
View File

@ -31,7 +31,7 @@ License
template<class Type>
void Foam::valuePointPatchField<Type>::checkFieldSize() const
{
if (size() != this->patch().size())
if (this->size() != this->patch().size())
{
FatalErrorIn
(
@ -166,7 +166,7 @@ void Foam::valuePointPatchField<Type>::updateCoeffs()
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, *this);
this->setInInternalField(iF, *this);
pointPatchField<Type>::updateCoeffs();
}
@ -178,7 +178,7 @@ void Foam::valuePointPatchField<Type>::evaluate(const Pstream::commsTypes)
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, *this);
this->setInInternalField(iF, *this);
pointPatchField<Type>::evaluate();
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
View File

@ -172,7 +172,7 @@ void Foam::cyclicPointPatchField<Type>::swapAddSeparated
Swap(pf[pairs[pairi][0]], nbrPf[pairs[pairi][1]]);
}
}
addToInternalField(pField, pf);
this->addToInternalField(pField, pf);
nbr.addToInternalField(pField, nbrPf);
}
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
View File

@ -95,7 +95,7 @@ void Foam::cyclicSlipPointPatchField<Type>::evaluate(const Pstream::commsTypes)
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, tvalues());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
View File

@ -102,7 +102,7 @@ void Foam::nonuniformTransformCyclicPointPatchField<Type>::evaluate
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, tvalues());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C
View File

@ -151,7 +151,7 @@ void Foam::processorCyclicPointPatchField<Type>::swapAddSeparated
}
// All points are separated
addToInternalField(pField, pnf);
this->addToInternalField(pField, pnf);
}
}

2
src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
View File

@ -125,7 +125,7 @@ void Foam::wedgePointPatchField<Type>::evaluate(const Pstream::commsTypes)
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, tvalues());
this->setInInternalField(iF, tvalues());
}

2
src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
View File

@ -92,7 +92,7 @@ void Foam::fixedNormalSlipPointPatchField<Type>::evaluate
// Get internal field to insert values into
Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());
setInInternalField(iF, tvalues());
this->setInInternalField(iF, tvalues());
}

15
src/dynamicMesh/meshCut/directions/directions.C
View File

@ -401,10 +401,7 @@ Foam::directions::directions
if (wantNormal)
{
operator[](nDirs++) = normalDirs;
//// Dump to file.
//writeOBJ("normal.obj", mesh, normalDirs);
this->operator[](nDirs++) = normalDirs;
}
}
@ -423,20 +420,14 @@ Foam::directions::directions
if (wantTan1)
{
operator[](nDirs++) = tan1Dirs;
//// Dump to file.
//writeOBJ("tan1.obj", mesh, tan1Dirs);
this->operator[](nDirs++) = tan1Dirs;
}
}
if (wantTan2)
{
vectorField tan2Dirs = normalDirs ^ tan1Dirs;
operator[](nDirs++) = tan2Dirs;
//// Dump to file.
//writeOBJ("tan2.obj", mesh, tan2Dirs);
this->operator[](nDirs++) = tan2Dirs;
}
}
else

2
src/finiteVolume/cfdTools/general/porousMedia/PorousZones.C
View File

@ -175,7 +175,7 @@ bool Foam::PorousZones<ZoneType>::readData(Istream& is)
typename ZoneType::iNew(mesh_)
);
transfer(newLst);
this->transfer(newLst);
return is.good();
}

11
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
View File

@ -517,7 +517,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
(
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*U.oldTime()) & mesh().Sf())
@ -578,7 +578,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
*(
fvc::interpolate(rDeltaT*rA*rho.oldTime())*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*rho.oldTime()*U.oldTime())
@ -598,7 +598,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff
this->fvcDdtPhiCoeff
(
U.oldTime(),
phi.oldTime()/fvc::interpolate(rho.oldTime())
@ -627,8 +627,9 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phi.oldTime())
*(
this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phi.oldTime())
* (
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (
fvc::interpolate(rDeltaT*rA*U.oldTime())&mesh().Sf()

11
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C
View File

@ -946,7 +946,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
*fvc::interpolate(rA)
*(
(rDtCoef*phi.oldTime() + offCentre_(dphidt0()))
@ -1045,7 +1045,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
(
fvc::interpolate(rA*rho.oldTime())
*(rDtCoef*phi.oldTime() + offCentre_(dphidt0()))
@ -1090,7 +1090,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff
this->fvcDdtPhiCoeff
(
U.oldTime(),
phi.oldTime()/fvc::interpolate(rho.oldTime())
@ -1139,8 +1139,9 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phi.oldTime())*
(
this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phi.oldTime())
* (
fvc::interpolate(rA)
*(rDtCoef*phi.oldTime() + offCentre_(dphidt0()))
- (

25
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
View File

@ -394,8 +394,8 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime(), phiCorr())
*fvc::interpolate(rDeltaT*rA)*phiCorr
this->fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime(), phiCorr())
* fvc::interpolate(rDeltaT*rA)*phiCorr
)
);
}
@ -436,11 +436,13 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
(
ddtIOobject,
rDeltaT
*fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime())
*(
* this->fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime())
* (
fvc::interpolate(rA*rho.oldTime())*phiAbs.oldTime()
- (fvc::interpolate(rA*rho.oldTime()*U.oldTime())
& mesh().Sf())
- (
fvc::interpolate(rA*rho.oldTime()*U.oldTime())
& mesh().Sf()
)
)
)
);
@ -457,14 +459,14 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
(
ddtIOobject,
rDeltaT
*fvcDdtPhiCoeff
* this->fvcDdtPhiCoeff
(
U.oldTime(),
phiAbs.oldTime()/fvc::interpolate(rho.oldTime())
)
*(
* (
fvc::interpolate(rA*rho.oldTime())
*phiAbs.oldTime()/fvc::interpolate(rho.oldTime())
* phiAbs.oldTime()/fvc::interpolate(rho.oldTime())
- (
fvc::interpolate
(
@ -487,8 +489,9 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
(
ddtIOobject,
rDeltaT
*fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phiAbs.oldTime())
*(
* this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phiAbs.oldTime())
* (
fvc::interpolate(rA)*phiAbs.oldTime()
- (fvc::interpolate(rA*U.oldTime()) & mesh().Sf())
)

11
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
View File

@ -522,7 +522,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
(
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*U.oldTime()) & mesh().Sf())
@ -583,7 +583,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
*(
fvc::interpolate(rDeltaT*rA*rho.oldTime())*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*rho.oldTime()*U.oldTime())
@ -603,7 +603,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff
this->fvcDdtPhiCoeff
(
U.oldTime(),
phi.oldTime()/fvc::interpolate(rho.oldTime())
@ -632,8 +632,9 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phi.oldTime())
*(
this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phi.oldTime())
* (
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (
fvc::interpolate(rDeltaT*rA*U.oldTime())&mesh().Sf()

13
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
View File

@ -542,7 +542,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
rDeltaT*fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
rDeltaT*this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
*(
fvc::interpolate(rA)
*(
@ -606,7 +606,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
rDeltaT*fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime())
rDeltaT*this->fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime())
*(
coefft0*fvc::interpolate(rA*rho.oldTime())
*phiAbs.oldTime()
@ -639,7 +639,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
(
ddtIOobject,
rDeltaT
*fvcDdtPhiCoeff
*this->fvcDdtPhiCoeff
(
U.oldTime(),
phiAbs.oldTime()/fvc::interpolate(rho.oldTime())
@ -678,10 +678,11 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
(
ddtIOobject,
rDeltaT
*fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phiAbs.oldTime())
*(
* this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phiAbs.oldTime())
* (
fvc::interpolate(rA)
*(
* (
coefft0*phiAbs.oldTime()
- coefft00*phiAbs.oldTime().oldTime()
)

11
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
View File

@ -417,7 +417,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())*
(
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*U.oldTime()) & mesh().Sf())
@ -478,7 +478,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime())
*(
fvc::interpolate(rDeltaT*rA*rho.oldTime())*phi.oldTime()
- (fvc::interpolate(rDeltaT*rA*rho.oldTime()*U.oldTime())
@ -498,7 +498,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff
this->fvcDdtPhiCoeff
(
U.oldTime(),
phi.oldTime()/fvc::interpolate(rho.oldTime())
@ -527,8 +527,9 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
new fluxFieldType
(
ddtIOobject,
fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phi.oldTime())
*(
this->fvcDdtPhiCoeff
(rho.oldTime(), U.oldTime(), phi.oldTime())
* (
fvc::interpolate(rDeltaT*rA)*phi.oldTime()
- (
fvc::interpolate(rDeltaT*rA*U.oldTime())&mesh().Sf()

2
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
View File

@ -215,7 +215,7 @@ limitedSurfaceInterpolationScheme<Type>::flux
const GeometricField<Type, fvPatchField, volMesh>& phi
) const
{
return faceFlux_*interpolate(phi);
return faceFlux_*this->interpolate(phi);
}

2
src/lagrangian/basic/Cloud/Cloud.C
View File

@ -383,7 +383,7 @@ Foam::label Foam::Cloud<ParticleType>::getNewParticleID() const
template<class ParticleType>
void Foam::Cloud<ParticleType>::addParticle(ParticleType* pPtr)
{
append(pPtr);
this->append(pPtr);
}

2
src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
View File

@ -511,7 +511,7 @@ void Foam::DsmcCloud<ParcelType>::addNewParcel
typeId
);
addParticle(pPtr);
this->addParticle(pPtr);
}

4
src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
View File

@ -86,7 +86,7 @@ void Foam::gnuplotSetWriter<Type>::write
forAll(valueSets, i)
{
writeTable(points, *valueSets[i], os);
this->writeTable(points, *valueSets[i], os);
os << "e" << nl;
}
}
@ -131,7 +131,7 @@ void Foam::gnuplotSetWriter<Type>::write
forAll(valueSets, i)
{
writeTable(trackPoints[trackI], valueSets[i][trackI], os);
this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
os << "e" << nl;
}
}

2
src/sampling/sampledSet/writers/jplot/jplotSetWriter.C
View File

@ -96,7 +96,7 @@ void Foam::jplotSetWriter<Type>::write
columns[i] = valueSets[i];
}
writeTable(points, columns, os);
this->writeTable(points, columns, os);
}

4
src/sampling/sampledSet/writers/raw/rawSetWriter.C
View File

@ -74,7 +74,7 @@ void Foam::rawSetWriter<Type>::write
columns[i] = valueSets[i];
}
writeTable(points, columns, os);
this->writeTable(points, columns, os);
}
@ -106,7 +106,7 @@ void Foam::rawSetWriter<Type>::write
columns[i] = &valueSets[i][trackI];
}
writeTable(points[trackI], columns, os);
this->writeTable(points[trackI], columns, os);
os << nl << nl;
}
}

4
src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C
View File

@ -78,7 +78,7 @@ void Foam::xmgraceSetWriter<Type>::write
<< valueSetNames[i] << '"' << nl
<< "@target G0.S" << i << nl;
writeTable(points, *valueSets[i], os);
this->writeTable(points, *valueSets[i], os);
os << '&' << nl;
}
@ -119,7 +119,7 @@ void Foam::xmgraceSetWriter<Type>::write
os << "@ s" << sI << " legend " << '"'
<< valueSetNames[i] << "_track" << i << '"' << nl
<< "@target G0.S" << sI << nl;
writeTable(trackPoints[trackI], valueSets[i][trackI], os);
this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
os << '&' << nl;
sI++;

2
src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
View File

@ -379,7 +379,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
}
}
sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
// add zones, culling empty ones
this->addZones(dynSizes, names, true);

4
src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
View File

@ -202,7 +202,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
// transfer to normal lists
this->storedPoints().transfer(dynPoints);
sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
// add zones, culling empty ones
this->addZones(dynSizes, dynNames, true);
@ -225,7 +225,7 @@ void Foam::fileFormats::OBJsurfaceFormat<Face>::write
const List<surfZone>& zones =
(
surf.surfZones().empty()
? oneZone(faceLst, "")
? surfaceFormatsCore::oneZone(faceLst, "")
: surf.surfZones()
);

2
src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
View File

@ -141,7 +141,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
}
// transfer to normal lists, no zone information
reset(pointLst.xfer(), dynFaces.xfer(), Xfer<surfZoneList>());
this->reset(pointLst.xfer(), dynFaces.xfer(), Xfer<surfZoneList>());
return true;
}

4
src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
View File

@ -234,7 +234,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
}
mapPointId.clear();
sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted);
// add zones, culling empty ones
this->addZones(dynSizes, dynNames, true);
@ -256,7 +256,7 @@ void Foam::fileFormats::STARCDsurfaceFormat<Face>::write
const List<surfZone>& zones =
(
surf.surfZones().empty()
? oneZone(faceLst)
? surfaceFormatsCore::oneZone(faceLst)
: surf.surfZones()
);

10
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
View File

@ -33,7 +33,7 @@ Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
{
OStringStream reaction;
for (label i = 0; i < lhs_.size(); i++)
for (label i = 0; i < lhs_.size(); ++i)
{
if (i > 0)
{
@ -52,7 +52,7 @@ Foam::string Foam::Reaction<ReactionThermo>::reactionStr() const
reaction << " = ";
for (label i = 0; i < rhs_.size(); i++)
for (label i = 0; i < rhs_.size(); ++i)
{
if (i > 0)
{
@ -86,9 +86,9 @@ void Foam::Reaction<ReactionThermo>::setThermo
rhs_[0].stoichCoeff*(*thermoDatabase[species_[rhs_[0].index]])
);
for (label i=1; i<rhs_.size(); i++)
for (label i=1; i<rhs_.size(); ++i)
{
operator+=
this->operator+=
(
rhs_[i].stoichCoeff*(*thermoDatabase[species_[rhs_[i].index]])
);
@ -96,7 +96,7 @@ void Foam::Reaction<ReactionThermo>::setThermo
forAll(lhs_, i)
{
operator-=
this->operator-=
(
lhs_[i].stoichCoeff*(*thermoDatabase[species_[lhs_[i].index]])
);