Merge branch 'bugfix/cuttingPlaneUListError' into nextRelease

This commit is contained in:
Hrvoje Jasak 2014-01-16 15:56:05 +00:00
commit 20d25e610c

View file

@ -52,7 +52,7 @@ void Foam::cuttingPlane::calcCutCells
const edgeList& edges = mesh.edges(); const edgeList& edges = mesh.edges();
label listSize = cellEdges.size(); label listSize = cellEdges.size();
if (&cellIdLabels) if (!cellIdLabels.empty())
{ {
listSize = cellIdLabels.size(); listSize = cellIdLabels.size();
} }
@ -65,7 +65,7 @@ void Foam::cuttingPlane::calcCutCells
for (label listI = 0; listI < listSize; ++listI) for (label listI = 0; listI < listSize; ++listI)
{ {
label cellI = listI; label cellI = listI;
if (&cellIdLabels) if (!cellIdLabels.empty())
{ {
cellI = cellIdLabels[listI]; cellI = cellIdLabels[listI];
} }
@ -402,7 +402,7 @@ void Foam::cuttingPlane::remapFaces
) )
{ {
// recalculate the cells cut // recalculate the cells cut
if (&faceMap && faceMap.size()) if (!faceMap.empty())
{ {
MeshStorage::remapFaces(faceMap); MeshStorage::remapFaces(faceMap);