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

Further standardization of loop index naming: pointI -> pointi, patchI -> patchi

Browse Source
This commit is contained in:
Henry Weller
2016-05-18 21:20:42 +01:00
parent ac632e7984
commit 67de20df25
365 changed files with 4877 additions and 4877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
View File

@ -328,8 +328,8 @@ bool Foam::edgeIntersections::rotatePerturb
const edge& e = surf1.edges()[edgeI];
// Endpoint to modify. Choose either start or end.
label pointI = e[rndGen.bit()];
//label pointI = e[0];
label pointi = e[rndGen.bit()];
//label pointi = e[0];
// Generate random vector slightly larger than tolerance.
vector rndVec = rndGen.vector01() - vector(0.5, 0.5, 0.5);
@ -347,17 +347,17 @@ bool Foam::edgeIntersections::rotatePerturb
// Scale to be moved by tolerance.
rndVec *= 0.01*magN;
Pout<< "rotating: shifting endpoint " << meshPoints[pointI]
Pout<< "rotating: shifting endpoint " << meshPoints[pointi]
<< " of edge:" << edgeI << " verts:"
<< points1[meshPoints[e[0]]] << ' '
<< points1[meshPoints[e[1]]]
<< " by " << rndVec
<< " tol:" << surf1PointTol[pointI] << endl;
<< " tol:" << surf1PointTol[pointi] << endl;
points1[meshPoints[pointI]] += rndVec;
points1[meshPoints[pointi]] += rndVec;
// Mark edges affected by change to point
const labelList& pEdges = surf1.pointEdges()[pointI];
const labelList& pEdges = surf1.pointEdges()[pointi];
forAll(pEdges, i)
{
@ -519,9 +519,9 @@ Foam::scalarField Foam::edgeIntersections::minEdgeLength(const triSurface& surf)
scalarField minLen(localPoints.size());
forAll(minLen, pointI)
forAll(minLen, pointi)
{
const labelList& pEdges = pointEdges[pointI];
const labelList& pEdges = pointEdges[pointi];
scalar minDist = GREAT;
@ -530,7 +530,7 @@ Foam::scalarField Foam::edgeIntersections::minEdgeLength(const triSurface& surf)
minDist = min(minDist, edges[pEdges[i]].mag(localPoints));
}
minLen[pointI] = minDist;
minLen[pointi] = minDist;
}
return minLen;
}

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

@ -573,11 +573,11 @@ void Foam::surfaceIntersection::doCutEdges
// Calculate local (to point) tolerance based on min edge length.
scalarField surf1PointTol(surf1Pts.size());
forAll(surf1PointTol, pointI)
forAll(surf1PointTol, pointi)
{
surf1PointTol[pointI] =
surf1PointTol[pointi] =
intersection::planarTol()
* minEdgeLen(surf1, pointI);
* minEdgeLen(surf1, pointi);
}
const triSurface& surf2 = querySurf2.surface();
@ -959,13 +959,13 @@ Foam::surfaceIntersection::surfaceIntersection
forAllConstIter(labelPairLookup, facePairToVertex_, iter)
{
label pointI = iter();
label pointi = iter();
if (!usedPoints.found(pointI))
if (!usedPoints.found(pointi))
{
WarningInFunction
<< "Problem: cut point:" << pointI
<< " coord:" << cutPoints_[pointI]
<< "Problem: cut point:" << pointi
<< " coord:" << cutPoints_[pointi]
<< " not used by any edge" << endl;
}
}

2
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
View File

@ -124,7 +124,7 @@ class surfaceIntersection
static void transfer(List<DynamicList<T>>&, List<List<T>>&);
//- Get minimum length of all edges connected to point
static scalar minEdgeLen(const triSurface& surf, const label pointI);
static scalar minEdgeLen(const triSurface& surf, const label pointi);
//- Get edge label of edge between face vertices fp and fp+1
static label getEdge

12
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
View File

@ -64,10 +64,10 @@ void Foam::surfaceIntersection::writeOBJ
Foam::scalar Foam::surfaceIntersection::minEdgeLen
(
const triSurface& surf,
const label pointI
const label pointi
)
{
const labelList& pEdges = surf.pointEdges()[pointI];
const labelList& pEdges = surf.pointEdges()[pointi];
scalar minLen = GREAT;
@ -265,13 +265,13 @@ void Foam::surfaceIntersection::writeIntersectedEdges
// Dump all points (surface followed by cutPoints)
const pointField& pts = surf.localPoints();
forAll(pts, pointI)
forAll(pts, pointi)
{
writeOBJ(pts[pointI], os);
writeOBJ(pts[pointi], os);
}
forAll(cutPoints(), cutPointI)
forAll(cutPoints(), cutPointi)
{
writeOBJ(cutPoints()[cutPointI], os);
writeOBJ(cutPoints()[cutPointi], os);
}
forAll(edgeCutVerts, edgeI)