songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blockMesh: Improve block merge face correspondence test

Browse Source
This commit is contained in:
Henry Weller 2015-07-05 18:23:37 +01:00
parent 722a824b44
commit 109d84104f
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,7 @@ void Foam::blockMesh::calcMergeInfo()
blockPfaceLabel++
)
{
if
(
blockFaces[blockPfaces[blockPfaceLabel]]
== blockFaces[blockFaceLabel]
)
if (blockPfaces[blockPfaceLabel] == blockFaceLabel)
{
foundFace = true;
break;
@ -345,7 +341,6 @@ void Foam::blockMesh::calcMergeInfo()
}
}
// FIXME? - there seems to be some logic missing here
label blockNfaceLabel;
for
@ -365,8 +360,6 @@ void Foam::blockMesh::calcMergeInfo()
}
}
// FIXME? - there seems to be some logic missing here
const labelListList& blockPfaceFaces =
blocks[blockPlabel].boundaryPatches()[blockPfaceLabel];
@ -416,7 +409,7 @@ void Foam::blockMesh::calcMergeInfo()
{
FatalErrorIn("blockMesh::calcMergeInfo()")
<< "Point merging failed after max number of passes."
<< abort(FatalError);
<< exit(FatalError);
}
}
while (changedPointMerge);
@ -560,7 +553,8 @@ void Foam::blockMesh::calcMergeInfo()
if (mergeList_[pointLabel] > pointLabel)
{
FatalErrorIn("blockMesh::calcMergeInfo()")
<< "ouch" << exit(FatalError);
<< "Merge list contains point index out of range"
<< exit(FatalError);
}
if
@ -579,7 +573,6 @@ void Foam::blockMesh::calcMergeInfo()
}
nPoints_ = newPointLabel;
}