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

Revert "ENH: match defaultMatchTol public."

Browse Source 
This reverts commit 8c8a4a00c8.
This commit is contained in:
graham
2011-06-23 12:15:00 +01:00
parent 8c8a4a00c8
commit 6e32fd04a2
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
View File

@ -34,7 +34,7 @@ namespace Foam
{ {
defineTypeNameAndDebug(coupledPolyPatch, 0); defineTypeNameAndDebug(coupledPolyPatch, 0);
scalar coupledPolyPatch::defaultMatchTol = 1E-4; const scalar coupledPolyPatch::defaultMatchTol_ = 1E-4;
template<> template<>
const char* NamedEnum<coupledPolyPatch::transformType, 4>::names[] = const char* NamedEnum<coupledPolyPatch::transformType, 4>::names[] =
@ -403,7 +403,7 @@ Foam::coupledPolyPatch::coupledPolyPatch
) )
: :
polyPatch(name, size, start, index, bm), polyPatch(name, size, start, index, bm),
matchTolerance_(defaultMatchTol) matchTolerance_(defaultMatchTol_)
{} {}
@ -416,7 +416,7 @@ Foam::coupledPolyPatch::coupledPolyPatch
) )
: :
polyPatch(name, dict, index, bm), 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 void Foam::coupledPolyPatch::write(Ostream& os) const
{ {
polyPatch::write(os); polyPatch::write(os);
//if (matchTolerance_ != defaultMatchTol) //if (matchTolerance_ != defaultMatchTol_)
{ {
os.writeKeyword("matchTolerance") << matchTolerance_ os.writeKeyword("matchTolerance") << matchTolerance_
<< token::END_STATEMENT << nl; << token::END_STATEMENT << nl;

5
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
View File

@ -69,6 +69,9 @@ private:
// Private data // Private data
//- default matching tolerance
static const scalar defaultMatchTol_;
//- local matching tolerance //- local matching tolerance
const scalar matchTolerance_; const scalar matchTolerance_;
@ -179,8 +182,6 @@ public:
//- Runtime type information //- Runtime type information
TypeName("coupled"); TypeName("coupled");
//- default matching tolerance
static scalar defaultMatchTol;
// Constructors // Constructors

2
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -1458,8 +1458,6 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
label nValidPatches = 0; label nValidPatches = 0;
// coupledPolyPatch::defaultMatchTol = 1e-3;
forAll(patches, p) forAll(patches, p)
{ {
if (patchTypes[p] == processorPolyPatch::typeName) if (patchTypes[p] == processorPolyPatch::typeName)