zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blockMeshMerge: Increased merge tolerance

Browse Source 
Resolves bug-report https://bugs.openfoam.org/view.php?id=3233
This commit is contained in:
Henry Weller
2019-05-30 16:34:07 +01:00
parent 76a8284120
commit fa12851880
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mesh/blockMesh/blockMesh/blockMeshMerge.C
View File

@ -56,9 +56,7 @@ void Foam::blockMesh::calcMergeInfo()
}
// set unused to -1
mergeList_.setSize(nPoints_);
mergeList_ = -1;
mergeList_.setSize(nPoints_, -1);
const pointField& blockPoints = topology().points();
const cellList& blockCells = topology().cells();
@ -113,8 +111,11 @@ void Foam::blockMesh::calcMergeInfo()
// Collated points detected by initially taking a constant factor of
// the size of the block.
boundBox bb(blockCells[blockPlabel].points(blockFaces, blockPoints));
const scalar mergeSqrDist = magSqr(20*small*bb.span());
const boundBox bb
(
blockCells[blockPlabel].points(blockFaces, blockPoints)
);
const scalar mergeSqrDist = magSqr(50*small*bb.span());
// This is an N^2 algorithm
@ -548,35 +549,29 @@ void Foam::blockMesh::calcMergeInfo()
}
// Sort merge list to return new point label (in new shorter list)
// given old point label
label newPointLabel = 0;
// Sort merge list and count number of unique points
label nUniqPoints = 0;
forAll(mergeList_, pointLabel)
forAll(mergeList_, pointi)
{
if (mergeList_[pointLabel] > pointLabel)
if (mergeList_[pointi] > pointi)
{
FatalErrorInFunction
<< "Merge list contains point index out of range"
<< exit(FatalError);
}
if
(
mergeList_[pointLabel] == -1
|| mergeList_[pointLabel] == pointLabel
)
if (mergeList_[pointi] == -1 || mergeList_[pointi] == pointi)
{
mergeList_[pointLabel] = newPointLabel;
newPointLabel++;
mergeList_[pointi] = nUniqPoints++;
}
else
{
mergeList_[pointLabel] = mergeList_[mergeList_[pointLabel]];
mergeList_[pointi] = mergeList_[mergeList_[pointi]];
}
}
nPoints_ = newPointLabel;
nPoints_ = nUniqPoints;
}