zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -405,8 +405,9 @@ void visitPointRegion
}
else
{
FatalErrorIn("visitPointRegion(..)")
FatalErrorInFunction
<< "problem" << exit(FatalError);
nextFaceI = -1;
}
@ -439,7 +440,7 @@ void visitPointRegion
if (nextEdgeI == -1)
{
FatalErrorIn("visitPointRegion()")
FatalErrorInFunction
<< "Problem: cannot find edge out of " << fEdges
<< "on face " << nextFaceI << " that uses point " << pointI
<< " and is not edge " << startEdgeI << abort(FatalError);
@ -575,7 +576,7 @@ label dupNonManifoldPoints(triSurface& s, labelList& pointMap)
if (mag(dupPt-sPt) > SMALL)
{
FatalErrorIn("dupNonManifoldPoints(..)")
FatalErrorInFunction
<< "dupPt:" << dupPt
<< " sPt:" << sPt
<< exit(FatalError);
@ -802,7 +803,8 @@ labelList matchEdges
{
if (pointMap.size() != subSurf.nPoints())
{
FatalErrorIn("findEdges(..)") << "problem" << exit(FatalError);
FatalErrorInFunction
<< "problem" << exit(FatalError);
}
labelList edgeMap(subSurf.nEdges(), -1);
@ -834,7 +836,7 @@ labelList matchEdges
}
else if (edgeMap[subEdgeI] != edgeI)
{
WarningIn("findEdges(..)") << "sub edge "
FatalErrorInFunction
<< subE << " points:"
<< subE.line(subSurf.localPoints())
<< " matches to " << edgeI
@ -850,7 +852,7 @@ labelList matchEdges
if (edgeMap[subEdgeI] == -1)
{
FatalErrorIn("findEdges(..)") << "did not find edge matching "
FatalErrorInFunction
<< subE << " at:" << subSurf.localPoints()[subE[0]]
<< subSurf.localPoints()[subE[1]]
<< exit(FatalError);
@ -1448,7 +1450,7 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
}
else
{
FatalErrorIn("createEdgeMesh(..)")
FatalErrorInFunction
<< "Unsupported booleanSurface:booleanOpType and space "
<< action << " " << invertedSpace
<< abort(FatalError);
@ -1562,7 +1564,7 @@ int main(int argc, char *argv[])
if (!validActions.found(action))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Unsupported action " << action << endl
<< "Supported actions:" << validActions.toc() << abort(FatalError);
}
@ -1619,7 +1621,7 @@ int main(int argc, char *argv[])
if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Inverted space only makes sense for union or intersection."
<< exit(FatalError);
}