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

ENH: List/DynamicList appendUniq() method

Browse Source 
- affords some code reduction.

STYLE: use HashSet insert() without found() check in more places
This commit is contained in:
Mark Olesen
2021-04-06 12:29:26 +02:00
committed by Andrew Heather
parent 6dc6d7ca9a
commit cdbc3e2de6
36 changed files with 166 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/finiteArea/faMesh/faMeshDemandDrivenData.C
View File

@ -945,7 +945,7 @@ void Foam::faMesh::calcPointAreaNormals() const
labelList curPointPoints = curPatch.edgeLoops()[0];
for (int i = 0; i < curPointPoints.size(); ++i)
for (label i = 0; i < curPointPoints.size(); ++i)
{
vector d1 =
points[curPatch.meshPoints()[curPointPoints[i]]]
@ -1212,60 +1212,35 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
labelHashSet pointSet;
pointSet.insert(curPoint);
for (label i=0; i<curFaces.size(); ++i)
for (const label facei : curFaces)
{
const labelList& facePoints = faces[curFaces[i]];
for (label j=0; j<facePoints.size(); ++j)
{
if (!pointSet.found(facePoints[j]))
{
pointSet.insert(facePoints[j]);
}
}
const labelList& facePoints = faces[facei];
pointSet.insert(facePoints);
}
pointSet.erase(curPoint);
labelList curPoints(pointSet.toc());
if (curPoints.size() < 5)
if (pointSet.size() < 5)
{
DebugInfo
<< "WARNING: Extending point set for fitting." << endl;
labelHashSet faceSet(pointFaces[curPoint]);
labelList curFaces(faceSet.toc());
forAll(curFaces, faceI)
for (const label facei : curFaces)
{
const labelList& curFaceFaces =
patch().faceFaces()[curFaces[faceI]];
forAll(curFaceFaces, fI)
{
label curFaceFace = curFaceFaces[fI];
if (!faceSet.found(curFaceFace))
{
faceSet.insert(curFaceFace);
}
}
const labelList& curFaceFaces = patch().faceFaces()[facei];
faceSet.insert(curFaceFaces);
}
curFaces = faceSet.toc();
labelHashSet pointSet;
pointSet.clear();
pointSet.insert(curPoint);
for (label i=0; i<curFaces.size(); ++i)
for (const label facei : curFaces)
{
const labelList& facePoints = faces[curFaces[i]];
for (label j=0; j<facePoints.size(); ++j)
{
if (!pointSet.found(facePoints[j]))
{
pointSet.insert(facePoints[j]);
}
}
const labelList& facePoints = faces[facei];
pointSet.insert(facePoints);
}
pointSet.erase(curPoint);
curPoints = pointSet.toc();
}
@ -1372,17 +1347,10 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
labelHashSet pointSet;
pointSet.insert(curPoint);
for (label i=0; i<curFaces.size(); ++i)
for (const label facei : curFaces)
{
const labelList& facePoints = faces[curFaces[i]];
for (label j=0; j<facePoints.size(); ++j)
{
if (!pointSet.found(facePoints[j]))
{
pointSet.insert(facePoints[j]);
}
}
const labelList& facePoints = faces[facei];
pointSet.insert(facePoints);
}
pointSet.erase(curPoint);
labelList curPoints = pointSet.toc();
@ -1456,17 +1424,10 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
labelHashSet pointSet;
pointSet.insert(curPoint);
for (label i=0; i<curFaces.size(); ++i)
for (const label facei : curFaces)
{
const labelList& facePoints = faces[curFaces[i]];
for (label j=0; j<facePoints.size(); ++j)
{
if (!pointSet.found(facePoints[j]))
{
pointSet.insert(facePoints[j]);
}
}
const labelList& facePoints = faces[facei];
pointSet.insert(facePoints);
}
pointSet.erase(curPoint);
labelList curPoints = pointSet.toc();
@ -1653,17 +1614,10 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
const labelList curFaces(faceSet.toc());
labelHashSet pointSet;
pointSet.insert(curPoint);
for (label i=0; i<curFaces.size(); ++i)
for (const label facei : curFaces)
{
const labelList& facePoints = faces[curFaces[i]];
for (label j=0; j<facePoints.size(); ++j)
{
if (!pointSet.found(facePoints[j]))
{
pointSet.insert(facePoints[j]);
}
}
const labelList& facePoints = faces[facei];
pointSet.insert(facePoints);
}
pointSet.erase(curPoint);
labelList curPoints = pointSet.toc();