From 2ac4e0a4d70d79257c55a67ba347f2e8ef6ad6f6 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Tue, 8 Jan 2013 17:15:08 +0100 Subject: [PATCH] Changes for gcc 4.7 on Ubuntu 12.10 --- .../rpmBuild/SOURCES/paraview-gcc47.patch | 24 +++++++++++++++++++ .../rpmBuild/SPECS/ParaView-3.12.0.spec | 3 +++ .../HashTables/HashPtrTable/HashPtrTable.C | 2 +- .../HashTables/HashPtrTable/HashPtrTableIO.C | 4 ++-- .../containers/HashTables/HashSet/HashSet.C | 18 +++++++------- .../LinkedLists/accessTypes/ILList/ILList.C | 6 ++--- .../LinkedLists/accessTypes/ILList/ILListIO.C | 8 +++---- .../accessTypes/LPtrList/LPtrListIO.C | 12 +++++----- .../DimensionedField/DimensionedField.C | 2 +- .../DimensionedField/DimensionedFieldIO.C | 2 +- .../GeometricField/GeometricBoundaryField.C | 12 +++++----- .../basic/value/ValuePointPatchField.C | 4 ++-- .../processor/ProcessorPointPatchField.C | 6 ++--- .../derived/global/GlobalPointPatchField.C | 2 +- .../BlockBiCGStab/BlockBiCGStabSolver.C | 2 +- .../BlockLduSolvers/BlockCG/BlockCGSolver.C | 2 +- .../BlockGMRES/BlockGMRESSolver.C | 2 +- .../BlockGaussSeidel/BlockGaussSeidelSolver.C | 2 +- .../trackedParticle/ExactParticle.C | 2 +- .../TimeActivatedExplicitSourceList.C | 2 +- .../CoEulerDdtScheme/CoEulerDdtScheme.C | 8 +++---- .../CrankNicholsonDdtScheme.C | 8 +++---- .../EulerDdtScheme/EulerDdtScheme.C | 8 +++---- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 8 +++---- .../backwardDdtScheme/backwardDdtScheme.C | 8 +++---- .../limitedSurfaceInterpolationScheme.C | 2 +- .../multivariateSurfaceInterpolationScheme.H | 2 +- src/lagrangian/basic/Cloud/Cloud.C | 2 +- .../clouds/Templates/DsmcCloud/DsmcCloud.C | 2 +- .../ReactingMultiphaseParcel.C | 10 ++++---- .../Templates/ReactingParcel/ReactingParcel.C | 4 ++-- .../Templates/ThermoParcel/ThermoParcel.C | 2 +- .../writers/gnuplot/gnuplotSetWriter.C | 4 ++-- .../sampledSet/writers/jplot/jplotSetWriter.C | 2 +- .../sampledSet/writers/raw/rawSetWriter.C | 4 ++-- .../writers/xmgrace/xmgraceSetWriter.C | 4 ++-- .../surfaceFormats/ac3d/AC3DsurfaceFormat.C | 4 ++-- .../surfaceFormats/nas/NASsurfaceFormat.C | 4 ++-- .../surfaceFormats/obj/OBJsurfaceFormat.C | 6 ++--- .../surfaceFormats/off/OFFsurfaceFormat.C | 2 +- .../surfaceFormats/smesh/SMESHsurfaceFormat.C | 2 +- .../starcd/STARCDsurfaceFormat.C | 4 ++-- .../surfaceFormats/stl/STLsurfaceFormat.C | 4 ++-- .../surfaceFormats/tri/TRIsurfaceFormat.C | 2 +- .../surfaceFormats/vtk/VTKsurfaceFormat.C | 2 +- .../surfaceFormats/wrl/WRLsurfaceFormat.C | 2 +- .../surfaceFormats/x3d/X3DsurfaceFormat.C | 2 +- .../reaction/Reactions/Reaction/Reaction.C | 4 ++-- 48 files changed, 130 insertions(+), 103 deletions(-) create mode 100644 ThirdParty/rpmBuild/SOURCES/paraview-gcc47.patch diff --git a/ThirdParty/rpmBuild/SOURCES/paraview-gcc47.patch b/ThirdParty/rpmBuild/SOURCES/paraview-gcc47.patch new file mode 100644 index 000000000..c34e90126 --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/paraview-gcc47.patch @@ -0,0 +1,24 @@ +diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h +--- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 2012-01-27 12:12:55.623530977 -0700 ++++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h 2012-01-30 15:26:33.107335300 -0700 +@@ -72,7 +72,7 @@ public: + Clear = QItemSelectionModel::Clear, + Select = QItemSelectionModel::Select, + Deselect = QItemSelectionModel::Deselect, +- ClearAndSelect = Clear | Select ++ ClearAndSelect = static_cast(Clear) | static_cast(Select) + }; + Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag) + +diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx +--- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 2011-11-08 13:56:29.000000000 -0700 ++++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-01-27 09:30:00.088542888 -0700 +@@ -37,6 +37,8 @@ + #include "vtkTimeSourceExample.h" + #include "vtkXdmfReader.h" + ++#include ++ + #define NUMTESTS 20 + + const char testobject[NUMTESTS][40] = { diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec index c2b6ee2db..0003812c6 100644 --- a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec +++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec @@ -78,6 +78,7 @@ Source: %url/%{name}-%{version}.tar.gz Prefix: %{_prefix} Group: Development/Tools Patch0: ParaView-3.12.0.patch_darwin +Patch1: paraview-gcc47.patch %define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} @@ -109,6 +110,8 @@ Patch0: ParaView-3.12.0.patch_darwin %patch0 -p1 %endif +%patch1 -p1 + %build # # set CMake cache variables diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C index d4ee78d09..80b3dab90 100644 --- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C +++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C @@ -52,7 +52,7 @@ HashPtrTable::HashPtrTable(const HashPtrTable& ht) for (const_iterator iter = ht.begin(); iter != ht.end(); ++iter) { // Bug fix, Microsoft port. HJ, 21/Mar/2011 - insert(iter.key(), iter()->clone().ptr()); + this->insert(iter.key(), iter()->clone().ptr()); } } diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C index b82e2fbc9..4a0379f7c 100644 --- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C +++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C @@ -70,7 +70,7 @@ void HashPtrTable::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 ( @@ -117,7 +117,7 @@ void HashPtrTable::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 ( diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C index 48d4437b4..748710472 100644 --- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C +++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C @@ -48,7 +48,7 @@ Foam::HashSet::HashSet ++cit ) { - insert(cit.key()); + this->insert(cit.key()); } } @@ -58,7 +58,7 @@ Foam::HashSet::HashSet template inline bool Foam::HashSet::operator[](const Key& key) const { - return found(key); + return this->found(key); } @@ -77,7 +77,7 @@ bool Foam::HashSet::operator==(const HashSet& 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; } @@ -90,7 +90,7 @@ bool Foam::HashSet::operator==(const HashSet& rhs) const template bool Foam::HashSet::operator!=(const HashSet& rhs) const { - return !(operator==(rhs)); + return !(this->operator==(rhs)); } @@ -100,7 +100,7 @@ void Foam::HashSet::operator|=(const HashSet& rhs) // Add rhs elements into lhs for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter) { - insert(iter.key()); + this->insert(iter.key()); } } @@ -113,7 +113,7 @@ void Foam::HashSet::operator&=(const HashSet& rhs) { if (!rhs.found(iter.key())) { - erase(iter); + this->erase(iter); } } } @@ -127,11 +127,11 @@ void Foam::HashSet::operator^=(const HashSet& rhs) { if (found(iter.key())) { - erase(iter.key()); + this->erase(iter.key()); } else { - insert(iter.key()); + this->insert(iter.key()); } } } @@ -144,7 +144,7 @@ void Foam::HashSet::operator-=(const HashSet& rhs) // Remove rhs elements from lhs for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter) { - erase(iter.key()); + this->erase(iter.key()); } } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C index 087eea214..066e878c8 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C @@ -40,7 +40,7 @@ Foam::ILList::ILList(const ILList& lst) ++iter ) { - append(iter().clone().ptr()); + this->append(iter().clone().ptr()); } } @@ -63,7 +63,7 @@ Foam::ILList::ILList ++iter ) { - append(iter().clone(cloneArg).ptr()); + this->append(iter().clone(cloneArg).ptr()); } } #endif @@ -146,7 +146,7 @@ void Foam::ILList::operator=(const ILList& lst) ++iter ) { - append(iter().clone().ptr()); + this->append(iter().clone().ptr()); } } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C index eeac39165..854bdfd98 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C @@ -58,7 +58,7 @@ void Foam::ILList::read(Istream& is, const INew& iNew) { for (label i=0; iappend(iNew(is).ptr()); is.fatalCheck ( @@ -70,7 +70,7 @@ void Foam::ILList::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::ILList::read(Istream& is, const INew& iNew) for (label i=1; iappend(new T(*tPtr)); } } } @@ -112,7 +112,7 @@ void Foam::ILList::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&)"); diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C index 71ee04ed7..510f11b5f 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C @@ -61,7 +61,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) { for (label i=0; iappend(iNew(is).ptr()); is.fatalCheck ( @@ -73,7 +73,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) else { T* tPtr = iNew(is).ptr(); - append(tPtr); + this->append(tPtr); is.fatalCheck ( @@ -83,7 +83,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) for (label i=1; iclone().ptr()); + this->append(tPtr->clone().ptr()); } } } @@ -115,7 +115,7 @@ void Foam::LPtrList::read(Istream& is, const INew& iNew) ) { is.putBack(lastToken); - append(iNew(is).ptr()); + this->append(iNew(is).ptr()); is >> lastToken; is.fatalCheck @@ -145,14 +145,14 @@ template template Foam::LPtrList::LPtrList(Istream& is, const INew& iNew) { - read(is, iNew); + this->read(is, iNew); } template Foam::LPtrList::LPtrList(Istream& is) { - read(is, INew()); + this->read(is, INew()); } diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C index cd5209de5..c41399882 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C @@ -448,7 +448,7 @@ void DimensionedField::operator= checkField(*this, df, "="); dimensions_ = df.dimensions(); - transfer(const_cast&>(df)); + this->transfer(const_cast&>(df)); tdf.clear(); } diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C index 541673fcc..bdf4840c3 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C @@ -44,7 +44,7 @@ void DimensionedField::readField dimensions_.reset(dimensionSet(fieldDict.lookup("dimensions"))); Field f(fieldDictEntry, fieldDict, GeoMesh::size(mesh_)); - transfer(f); + this->transfer(f); } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C index 04742a347..b8d4952fd 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C @@ -53,7 +53,7 @@ GeometricBoundaryField forAll(bmesh_, patchi) { - set + this->set ( patchi, PatchField::New @@ -105,7 +105,7 @@ GeometricBoundaryField forAll(bmesh_, patchi) { - set + this->set ( patchi, PatchField::New @@ -142,7 +142,7 @@ GeometricBoundaryField forAll(bmesh_, patchi) { - set(patchi, ptfl[patchi].clone(field)); + this->set(patchi, ptfl[patchi].clone(field)); } } @@ -170,7 +170,7 @@ GeometricBoundaryField forAll(bmesh_, patchi) { - set(patchi, btf[patchi].clone(field)); + this->set(patchi, btf[patchi].clone(field)); } } @@ -227,7 +227,7 @@ GeometricBoundaryField { if (bmesh_[patchi].type() != emptyPolyPatch::typeName) { - set + this->set ( patchi, PatchField::New @@ -240,7 +240,7 @@ GeometricBoundaryField } else { - set + this->set ( patchi, PatchField::New diff --git a/src/OpenFOAM/fields/PointPatchFields/basic/value/ValuePointPatchField.C b/src/OpenFOAM/fields/PointPatchFields/basic/value/ValuePointPatchField.C index bbf85a0e8..9f9a1d2cc 100644 --- a/src/OpenFOAM/fields/PointPatchFields/basic/value/ValuePointPatchField.C +++ b/src/OpenFOAM/fields/PointPatchFields/basic/value/ValuePointPatchField.C @@ -240,7 +240,7 @@ updateCoeffs() // Get internal field to insert values into Field& iF = const_cast&>(this->internalField()); - setInInternalField(iF, values); + this->setInInternalField(iF, values); } PointPatchField:: @@ -273,7 +273,7 @@ ValuePointPatchField::evaluate // Get internal field to insert values into Field& iF = const_cast&>(this->internalField()); - setInInternalField(iF, values); + this->setInInternalField(iF, values); } PointPatchField::evaluate diff --git a/src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C b/src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C index b7835747d..61217dbd6 100644 --- a/src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C +++ b/src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C @@ -233,7 +233,7 @@ initAddFieldTempl const Field& pField ) const { - sendField(patchInternalField(pField), commsType); + sendField(this->patchInternalField(pField), commsType); } @@ -258,7 +258,7 @@ addFieldTempl { // Get the neighbour side values tmp > tpNeighbour = receivePointField(commsType); - addToInternalField(pField, tpNeighbour()); + this->addToInternalField(pField, tpNeighbour()); } @@ -511,7 +511,7 @@ evaluate } // Average over two sides - tpn = 0.5*(patchInternalField(this->internalField()) + tpn); + tpn = 0.5*(this->patchInternalField(this->internalField()) + tpn); // Get internal field to insert values into Field& iF = const_cast&>(this->internalField()); diff --git a/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C b/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C index 2dec37887..ccedca4c1 100644 --- a/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C +++ b/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C @@ -247,7 +247,7 @@ void GlobalPointPatchField { // Set the values from the global sum tmp > trpf = - reduceExtractPoint(patchInternalField(pField)); + reduceExtractPoint(this->patchInternalField(pField)); Field& rpf = trpf(); diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C index 81fe45c6b..522f87524 100644 --- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C +++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockBiCGStab/BlockBiCGStabSolver.C @@ -162,7 +162,7 @@ Foam::BlockBiCGStabSolver::solve solverPerf.finalResidual() = gSum(cmptMag(r))/norm; solverPerf.nIterations()++; - } while (!stop(solverPerf)); + } while (!this->stop(solverPerf)); } return solverPerf; diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C index 1c07bb7b0..5607119b1 100644 --- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C +++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockCG/BlockCGSolver.C @@ -144,7 +144,7 @@ typename Foam::BlockSolverPerformance Foam::BlockCGSolver::solve solverPerf.finalResidual() = gSum(cmptMag(rA))/norm; solverPerf.nIterations()++; - } while (!stop(solverPerf)); + } while (!this->stop(solverPerf)); } return solverPerf; diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C index 6415cf7bd..97390878c 100644 --- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C +++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGMRES/BlockGMRESSolver.C @@ -240,7 +240,7 @@ Foam::BlockGMRESSolver::solve solverPerf.finalResidual() = gSum(cmptMag(rA))/norm; solverPerf.nIterations()++; - } while (!stop(solverPerf)); + } while (!this->stop(solverPerf)); } return solverPerf; diff --git a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGaussSeidel/BlockGaussSeidelSolver.C b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGaussSeidel/BlockGaussSeidelSolver.C index 0819dc9d3..645b6c353 100644 --- a/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGaussSeidel/BlockGaussSeidelSolver.C +++ b/src/OpenFOAM/matrices/blockLduMatrix/BlockLduSolvers/BlockGaussSeidel/BlockGaussSeidelSolver.C @@ -106,7 +106,7 @@ Foam::BlockGaussSeidelSolver::solve solverPerf.finalResidual() = gSum(cmptMag(wA))/norm; solverPerf.nIterations()++; - } while (!stop(solverPerf)); + } while (!this->stop(solverPerf)); } return solverPerf; diff --git a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C b/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C index ca10b671d..0bff9ad37 100644 --- a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C +++ b/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C @@ -165,7 +165,7 @@ Foam::scalar Foam::ExactParticle::trackToFace this->position_ = endPosition; } - label patchi = patch(this->facei_); + label patchi = this->patch(this->facei_); const polyPatch& patch = mesh.boundaryMesh()[patchi]; if (isA(patch)) diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C index 2764b7dde..5135746d9 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C @@ -176,7 +176,7 @@ bool Foam::TimeActivatedExplicitSourceList::readData(Istream& is) typename TimeActivatedExplicitSource::iNew(mesh_, fieldNames_) ); - transfer(newSources); + this->transfer(newSources); return is.good(); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index 90e30fbb4..c0f0ff9ab 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -518,7 +518,7 @@ CoEulerDdtScheme::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()) @@ -579,7 +579,7 @@ CoEulerDdtScheme::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()) @@ -599,7 +599,7 @@ CoEulerDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - fvcDdtPhiCoeff + this->fvcDdtPhiCoeff ( U.oldTime(), phi.oldTime()/fvc::interpolate(rho.oldTime()) @@ -628,7 +628,7 @@ CoEulerDdtScheme::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() - ( diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C index 5f114ea4e..54d348bec 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C @@ -947,7 +947,7 @@ CrankNicholsonDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - fvcDdtPhiCoeff(U.oldTime(), phi.oldTime()) + this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime()) *fvc::interpolate(rA) *( (rDtCoef*phi.oldTime() + offCentre_(dphidt0())) @@ -1046,7 +1046,7 @@ CrankNicholsonDdtScheme::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())) @@ -1091,7 +1091,7 @@ CrankNicholsonDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - fvcDdtPhiCoeff + this->fvcDdtPhiCoeff ( U.oldTime(), phi.oldTime()/fvc::interpolate(rho.oldTime()) @@ -1140,7 +1140,7 @@ CrankNicholsonDdtScheme::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())) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C index 73cc88d29..8b1aafeef 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C @@ -395,7 +395,7 @@ EulerDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime(), phiCorr()) + this->fvcDdtPhiCoeff(U.oldTime(), phiAbs.oldTime(), phiCorr()) *fvc::interpolate(rDeltaT*rA)*phiCorr ) ); @@ -437,7 +437,7 @@ EulerDdtScheme::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()) @@ -458,7 +458,7 @@ EulerDdtScheme::fvcDdtPhiCorr ( ddtIOobject, rDeltaT - *fvcDdtPhiCoeff + *this->fvcDdtPhiCoeff ( U.oldTime(), phiAbs.oldTime()/fvc::interpolate(rho.oldTime()) @@ -488,7 +488,7 @@ EulerDdtScheme::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()) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 52296b526..6354907bc 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -520,7 +520,7 @@ SLTSDdtScheme::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()) @@ -581,7 +581,7 @@ SLTSDdtScheme::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()) @@ -601,7 +601,7 @@ SLTSDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - fvcDdtPhiCoeff + this->fvcDdtPhiCoeff ( U.oldTime(), phi.oldTime()/fvc::interpolate(rho.oldTime()) @@ -630,7 +630,7 @@ SLTSDdtScheme::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() - ( diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index 5123c6ff3..6fb9f925e 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -545,7 +545,7 @@ backwardDdtScheme::fvcDdtPhiCorr new fluxFieldType ( ddtIOobject, - rDeltaT*fvcDdtPhiCoeff(U.oldTime(), phi.oldTime()) + rDeltaT*this->fvcDdtPhiCoeff(U.oldTime(), phi.oldTime()) *( fvc::interpolate(rA) *( @@ -609,7 +609,7 @@ backwardDdtScheme::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() @@ -642,7 +642,7 @@ backwardDdtScheme::fvcDdtPhiCorr ( ddtIOobject, rDeltaT - *fvcDdtPhiCoeff + *this->fvcDdtPhiCoeff ( U.oldTime(), phiAbs.oldTime()/fvc::interpolate(rho.oldTime()) @@ -681,7 +681,7 @@ backwardDdtScheme::fvcDdtPhiCorr ( ddtIOobject, rDeltaT - *fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phiAbs.oldTime()) + *this->fvcDdtPhiCoeff(rho.oldTime(), U.oldTime(), phiAbs.oldTime()) *( fvc::interpolate(rA) *( diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C index d09ff3a43..a1d7a4741 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C @@ -217,7 +217,7 @@ limitedSurfaceInterpolationScheme::flux const GeometricField& phi ) const { - return faceFlux_*interpolate(phi); + return faceFlux_*this->interpolate(phi); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H index 912f3b9e8..6fba26aa5 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H @@ -68,7 +68,7 @@ public: void add(const GeometricField& f) { - insert(f.name(), &f); + this->insert(f.name(), &f); } }; diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C index cd5249cb0..376610560 100644 --- a/src/lagrangian/basic/Cloud/Cloud.C +++ b/src/lagrangian/basic/Cloud/Cloud.C @@ -87,7 +87,7 @@ Foam::label Foam::Cloud::getNewParticleID() const template void Foam::Cloud::addParticle(ParticleType* pPtr) { - append(pPtr); + this->append(pPtr); } diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C index df832a08a..e60d7ced3 100644 --- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C +++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C @@ -586,7 +586,7 @@ void Foam::DsmcCloud::addNewParcel typeId ); - addParticle(pPtr); + this->addParticle(pPtr); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 6249c422c..ddfabf61e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -249,7 +249,7 @@ void Foam::ReactingMultiphaseParcel::calc scalarField Cs(td.cloud().mcCarrierThermo().species().size(), 0.0); // Calc mass and enthalpy transfer due to phase change - calcPhaseChange + this->calcPhaseChange ( td, dt, @@ -278,7 +278,7 @@ void Foam::ReactingMultiphaseParcel::calc scalarField dMassDV(YGas_.size(), 0.0); // Calc mass and enthalpy transfer due to devolatilisation - calcDevolatilisation + this->calcDevolatilisation ( td, dt, @@ -299,7 +299,7 @@ void Foam::ReactingMultiphaseParcel::calc ); // Correct surface values due to emitted species - correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa); + this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa); // Surface reactions @@ -356,7 +356,7 @@ void Foam::ReactingMultiphaseParcel::calc // Calculate new particle temperature scalar T1 = - calcHeatTransfer + this->calcHeatTransfer ( td, dt, @@ -379,7 +379,7 @@ void Foam::ReactingMultiphaseParcel::calc // Calculate new particle velocity vector U1 = - calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); + this->calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); dUTrans += 0.5*(mass0 - mass1)*(U0 + U1); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 9299ff569..c98eb14a9 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -302,7 +302,7 @@ void Foam::ReactingParcel::calc // Calculate new particle temperature scalar T1 = - calcHeatTransfer + this->calcHeatTransfer ( td, dt, @@ -325,7 +325,7 @@ void Foam::ReactingParcel::calc // Calculate new particle velocity vector U1 = - calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); + this->calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); dUTrans += 0.5*(mass0 - mass1)*(U0 + U1); diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index 002f89083..0fedd714f 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -181,7 +181,7 @@ void Foam::ThermoParcel::calc // Calculate new particle velocity vector U1 = - calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); + this->calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans); // Accumulate carrier phase source terms diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C index 744969c6b..ac359a866 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C +++ b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C @@ -87,7 +87,7 @@ void Foam::gnuplotSetWriter::write forAll(valueSets, i) { - writeTable(points, *valueSets[i], os); + this->writeTable(points, *valueSets[i], os); os << "e" << nl; } } @@ -132,7 +132,7 @@ void Foam::gnuplotSetWriter::write forAll(valueSets, i) { - writeTable(trackPoints[trackI], valueSets[i][trackI], os); + this->writeTable(trackPoints[trackI], valueSets[i][trackI], os); os << "e" << nl; } } diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C b/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C index 3b01a8ff2..48938624d 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C +++ b/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C @@ -97,7 +97,7 @@ void Foam::jplotSetWriter::write columns[i] = valueSets[i]; } - writeTable(points, columns, os); + this->writeTable(points, columns, os); } diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/sampling/sampledSet/writers/raw/rawSetWriter.C index d5c9a6adb..fafeb05e4 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C +++ b/src/sampling/sampledSet/writers/raw/rawSetWriter.C @@ -75,7 +75,7 @@ void Foam::rawSetWriter::write columns[i] = valueSets[i]; } - writeTable(points, columns, os); + this->writeTable(points, columns, os); } @@ -107,7 +107,7 @@ void Foam::rawSetWriter::write columns[i] = &valueSets[i][trackI]; } - writeTable(points[trackI], columns, os); + this->writeTable(points[trackI], columns, os); os << nl << nl; } } diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C b/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C index ef87bed92..a28ffd4bb 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C +++ b/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C @@ -79,7 +79,7 @@ void Foam::xmgraceSetWriter::write << valueSetNames[i] << '"' << nl << "@target G0.S" << i << nl; - writeTable(points, *valueSets[i], os); + this->writeTable(points, *valueSets[i], os); os << '&' << nl; } @@ -120,7 +120,7 @@ void Foam::xmgraceSetWriter::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++; diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C index b303f17ef..975852bdf 100644 --- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C @@ -38,7 +38,7 @@ Foam::fileFormats::AC3DsurfaceFormat::AC3DsurfaceFormat const fileName& filename ) { - read(filename); + this->read(filename); } @@ -287,7 +287,7 @@ void Foam::fileFormats::AC3DsurfaceFormat::write ( surf.surfZones().size() ? surf.surfZones() - : oneZone(faceLst) + : AC3DsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C index 779a1b2ef..21669054d 100644 --- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C @@ -36,7 +36,7 @@ Foam::fileFormats::NASsurfaceFormat::NASsurfaceFormat const fileName& filename ) { - read(filename); + this->read(filename); } @@ -380,7 +380,7 @@ bool Foam::fileFormats::NASsurfaceFormat::read } } - sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted); + this->sortFacesAndStore(dynFaces.xfer(), dynZones.xfer(), sorted); // add zones, culling empty ones this->addZones(dynSizes, names, true); diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C index 1f067ef9a..607cd9a3a 100644 --- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C @@ -40,7 +40,7 @@ Foam::fileFormats::OBJsurfaceFormat::OBJsurfaceFormat const fileName& filename ) { - read(filename); + this->read(filename); } @@ -203,7 +203,7 @@ bool Foam::fileFormats::OBJsurfaceFormat::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); @@ -227,7 +227,7 @@ void Foam::fileFormats::OBJsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst, "") + : OBJsurfaceFormat::oneZone(faceLst, "") ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C index b62ec8fd2..a23e116e6 100644 --- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C @@ -142,7 +142,7 @@ bool Foam::fileFormats::OFFsurfaceFormat::read } // transfer to normal lists, no zone information - reset(pointLst.xfer(), dynFaces.xfer(), Xfer()); + this->reset(pointLst.xfer(), dynFaces.xfer(), Xfer()); return true; } diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C index 0234a56f8..f80efb6cf 100644 --- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C @@ -54,7 +54,7 @@ void Foam::fileFormats::SMESHsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : SMESHsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C index 434edcbea..c6f26f0b8 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C @@ -208,7 +208,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat::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); @@ -231,7 +231,7 @@ void Foam::fileFormats::STARCDsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : STARCDsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C index 04f46d4aa..02f17c254 100644 --- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C @@ -215,7 +215,7 @@ void Foam::fileFormats::STLsurfaceFormat::writeAscii ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : STLsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); @@ -276,7 +276,7 @@ void Foam::fileFormats::STLsurfaceFormat::writeBinary ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : STLsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C index 21b3aa714..f0872bc28 100644 --- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C @@ -141,7 +141,7 @@ void Foam::fileFormats::TRIsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : TRIsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C index 697e4ede4..6d9678ad1 100644 --- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C @@ -72,7 +72,7 @@ void Foam::fileFormats::VTKsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst) + : VTKsurfaceFormat::oneZone(faceLst) ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C index 117313415..6da4dd551 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C @@ -55,7 +55,7 @@ void Foam::fileFormats::WRLsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst, "") + : WRLsurfaceFormat::oneZone(faceLst, "") ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C index 227a41564..60073ddc9 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C @@ -57,7 +57,7 @@ void Foam::fileFormats::X3DsurfaceFormat::write ( surf.surfZones().size() > 1 ? surf.surfZones() - : oneZone(faceLst, "") + : X3DsurfaceFormat::oneZone(faceLst, "") ); const bool useFaceMap = (surf.useFaceMap() && zones.size() > 1); diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index b69d4f629..b4e03ced8 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -51,7 +51,7 @@ void Reaction::setThermo for (label i=1; ioperator+= ( rhs_[i].stoichCoeff*(*thermoDatabase[species_[rhs_[i].index]]) ); @@ -59,7 +59,7 @@ void Reaction::setThermo for (label i=0; ioperator-= ( lhs_[i].stoichCoeff*(*thermoDatabase[species_[lhs_[i].index]]) );