GIT: Resolve conflict with upstream merge from Foundation

This commit is contained in:
Andrew Heather
2015-12-07 17:07:20 +00:00
2154 changed files with 44622 additions and 24766 deletions

View File

@ -404,13 +404,8 @@ bool Foam::checkCoupledPoints
if (f.size() != nbrPoints[bFaceI].size())
{
FatalErrorIn
(
"Foam::checkCoupledPoints\n"
"(\n"
" const polyMesh&, const bool, labelHashSet*\n"
")\n"
) << "Local face size : " << f.size()
FatalErrorInFunction
<< "Local face size : " << f.size()
<< " does not equal neighbour face size : "
<< nbrPoints[bFaceI].size()
<< abort(FatalError);