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

Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2008-06-03 11:54:38 +01:00
parent 9baef871a4 e6770582ac
commit d0a44dd1e3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
View File

@ -281,7 +281,7 @@ void Foam::intersectedSurface::incCount
// Calculate point to edge addressing for the face given by the edge // Calculate point to edge addressing for the face given by the edge
// subset faceEdges. Constructs facePointEdges which for every point // subset faceEdges. Constructs facePointEdges which for every point
// gives a list of edge labels connected to it. // gives a list of edge labels connected to it.
Foam::Map<Foam::DynamicList<Foam::label> > Foam::Map<Foam::DynamicList<Foam::label> >
Foam::intersectedSurface::calcPointEdgeAddressing Foam::intersectedSurface::calcPointEdgeAddressing
( (
const edgeSurface& eSurf, const edgeSurface& eSurf,
@ -349,7 +349,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
( (
"intersectedSurface::calcPointEdgeAddressing" "intersectedSurface::calcPointEdgeAddressing"
"(const edgeSurface&, const label)" "(const edgeSurface&, const label)"
) << "Point:" << iter.key() << " used by too few edges:" ) << "Point:" << iter.key() << " used by too few edges:"
<< iter() << abort(FatalError); << iter() << abort(FatalError);
} }
} }
@ -501,7 +501,7 @@ Foam::label Foam::intersectedSurface::nextEdge
{ {
label stat = visited[edgeI]; label stat = visited[edgeI];
const edge& e = edges[edgeI]; const edge& e = edges[edgeI];
// Find out whether walk of edge from prevVert would be acceptible. // Find out whether walk of edge from prevVert would be acceptible.
if if
@ -519,7 +519,7 @@ Foam::label Foam::intersectedSurface::nextEdge
{ {
// Calculate angle of edge with respect to base e0, e1 // Calculate angle of edge with respect to base e0, e1
vector vec = vector vec =
n ^ points[e.otherVertex(prevVertI)] - points[prevVertI]; n ^ (points[e.otherVertex(prevVertI)] - points[prevVertI]);
vec /= mag(vec) + VSMALL; vec /= mag(vec) + VSMALL;
@ -591,7 +591,7 @@ Foam::face Foam::intersectedSurface::walkFace
{ {
const pointField& points = eSurf.points(); const pointField& points = eSurf.points();
const edgeList& edges = eSurf.edges(); const edgeList& edges = eSurf.edges();
// Overestimate size of face // Overestimate size of face
face f(eSurf.faceEdges()[faceI].size()); face f(eSurf.faceEdges()[faceI].size());
@ -634,7 +634,7 @@ Foam::face Foam::intersectedSurface::walkFace
break; break;
} }
// step from vertex to next edge // step from vertex to next edge
edgeI = nextEdge edgeI = nextEdge
( (
eSurf, eSurf,
@ -1132,7 +1132,7 @@ Foam::faceList Foam::intersectedSurface::splitFace
{ {
reverse(faces[i]); reverse(faces[i]);
} }
} }
return faces; return faces;
} }