diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C index e25deeb66b..545ce686b8 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C @@ -34,7 +34,7 @@ namespace Foam { defineTypeNameAndDebug(coupledPolyPatch, 0); - scalar coupledPolyPatch::defaultMatchTol = 1E-4; + const scalar coupledPolyPatch::defaultMatchTol_ = 1E-4; template<> const char* NamedEnum::names[] = @@ -403,7 +403,7 @@ Foam::coupledPolyPatch::coupledPolyPatch ) : polyPatch(name, size, start, index, bm), - matchTolerance_(defaultMatchTol) + matchTolerance_(defaultMatchTol_) {} @@ -416,7 +416,7 @@ Foam::coupledPolyPatch::coupledPolyPatch ) : polyPatch(name, dict, index, bm), - matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol)) + matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol_)) {} @@ -470,7 +470,7 @@ Foam::coupledPolyPatch::~coupledPolyPatch() void Foam::coupledPolyPatch::write(Ostream& os) const { polyPatch::write(os); - //if (matchTolerance_ != defaultMatchTol) + //if (matchTolerance_ != defaultMatchTol_) { os.writeKeyword("matchTolerance") << matchTolerance_ << token::END_STATEMENT << nl; diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H index 5add7fb04d..58cb8e66fa 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H @@ -69,6 +69,9 @@ private: // Private data + //- default matching tolerance + static const scalar defaultMatchTol_; + //- local matching tolerance const scalar matchTolerance_; @@ -179,8 +182,6 @@ public: //- Runtime type information TypeName("coupled"); - //- default matching tolerance - static scalar defaultMatchTol; // Constructors diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C index 39a841b07a..9a54c1361a 100644 --- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C +++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C @@ -1458,8 +1458,6 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality label nValidPatches = 0; - // coupledPolyPatch::defaultMatchTol = 1e-3; - forAll(patches, p) { if (patchTypes[p] == processorPolyPatch::typeName)