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: Resolve conflict with upstream merge from Foundation

Browse Source
This commit is contained in:
Andrew Heather
2015-12-07 17:07:20 +00:00
parent e35afa35bf 736621b945
commit 3f55f752fc
2154 changed files with 44622 additions and 24766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
View File

@ -184,7 +184,7 @@ bool Foam::surfaceIntersection::excludeEdgeHit
// }
// }
//
// FatalErrorIn("surfaceIntersection::borderEdgeIntersection")
// FatalErrorInFunction
// << "Did not find intersection of plane " << pl
// << " with edges of face " << hitFaceI << " verts:" << f
// << abort(FatalError);
@ -239,13 +239,8 @@ void Foam::surfaceIntersection::storeIntersection
if (mag(prevHit - thisHit) < SMALL)
{
WarningIn
(
"Foam::surfaceIntersection::storeIntersection"
"(const bool, const labelList&,"
"const label, DynamicList<edge>&,"
"DynamicList<point>&)"
) << "Encountered degenerate edge between face "
WarningInFunction
<< "Encountered degenerate edge between face "
<< twoFaces[0] << " on first surface"
<< " and face " << twoFaces[1] << " on second surface"
<< endl
@ -968,7 +963,7 @@ Foam::surfaceIntersection::surfaceIntersection
if (!usedPoints.found(pointI))
{
WarningIn("surfaceIntersection::surfaceIntersection")
WarningInFunction
<< "Problem: cut point:" << pointI
<< " coord:" << cutPoints_[pointI]
<< " not used by any edge" << endl;