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/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,7 +26,9 @@ Application
Description
Takes multiply connected surface and tries to split surface at
multiply connected edges by duplicating points. Introduces concept of
multiply connected edges by duplicating points.
Introduces concept of
- borderEdge. Edge with 4 faces connected to it.
- borderPoint. Point connected to exactly 2 borderEdges.
- borderLine. Connected list of borderEdges.
@ -152,14 +154,14 @@ void testSortedEdgeFaces(const triSurface& surf)
{
if (findIndex(sortMyFaces, myFaces[i]) == -1)
{
FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
forAll(sortMyFaces, i)
{
if (findIndex(myFaces, sortMyFaces[i]) == -1)
{
FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
}
@ -299,7 +301,7 @@ label findEdge
}
FatalErrorIn("findEdge(..)") << "Cannot find edge with labels " << v0
FatalErrorInFunction
<< ' ' << v1 << " in candidates " << edgeLabels
<< " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
<< abort(FatalError);
@ -338,7 +340,7 @@ label otherEdge
}
}
FatalErrorIn("otherEdge(..)") << "Cannot find other edge on face " << faceI
FatalErrorInFunction
<< " verts:" << surf.localPoints()[faceI]
<< " connected to point " << pointI
<< " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
@ -404,7 +406,7 @@ void walkSplitLine
if (eFaces.size() != 2)
{
FatalErrorIn("walkSplitPoint(..)")
FatalErrorInFunction
<< "Can only handle edges with 2 or 4 edges for now."
<< abort(FatalError);
}
@ -419,7 +421,7 @@ void walkSplitLine
}
else
{
FatalErrorIn("walkSplitPoint(..)") << abort(FatalError);
FatalErrorInFunction << abort(FatalError);
}
}
while (true);
@ -539,7 +541,7 @@ void calcPointVecs
surf.write("errorSurf.obj");
FatalErrorIn("calcPointVecs(..)")
FatalErrorInFunction
<< "Cannot find two faces using border edge " << edgeI
<< " verts:" << edges[edgeI]
<< " eFaces:" << eFaces << endl