Commit 109d8410 authored by Henry Weller's avatar Henry Weller
Browse files

blockMesh: Improve block merge face correspondence test

parent 722a824b
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment