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

STYLE: Rename variable from ...PointPairs to just ...Points.

Browse Source 
Better meaning in parallel.  Now additional check in storeSurfaceConformation.
This commit is contained in:
graham
2011-03-22 16:14:00 +00:00
parent 65d00c5e25
commit 4d369ccba4
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -1204,7 +1204,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
),
cvMeshControls_(*this, cvMeshDict),
startOfInternalPoints_(0),
startOfSurfacePointPairs_(0),
startOfSurfacePoints_(0),
featureVertices_(),
featurePointLocations_(),
featurePointTreePtr_(),
@ -1318,11 +1318,11 @@ void Foam::conformalVoronoiMesh::move()
vectorField displacementAccumulator
(
startOfSurfacePointPairs_,
startOfSurfacePoints_,
vector::zero
);
PackedBoolList pointToBeRetained(startOfSurfacePointPairs_, true);
PackedBoolList pointToBeRetained(startOfSurfacePoints_, true);
std::vector<Point> pointsToInsert;
@ -1621,7 +1621,7 @@ void Foam::conformalVoronoiMesh::move()
insertPoints(pointsToInsert);
startOfSurfacePointPairs_ = number_of_vertices();
startOfSurfacePoints_ = number_of_vertices();
label pointsRemoved =
displacementAccumulator.size()

5
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
View File

@ -133,8 +133,9 @@ private:
//- Keep track of the start of the internal points
label startOfInternalPoints_;
//- Keep track of the start of the surface point-pairs
label startOfSurfacePointPairs_;
//- Keep track of the start of the surface conformation points
// (including those referred for parallel conformation)
label startOfSurfacePoints_;
//- Store the feature constraining points to be reinserted after a
// triangulation clear

20
src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

@ -102,7 +102,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
return;
}
startOfSurfacePointPairs_ = number_of_vertices();
startOfSurfacePoints_ = number_of_vertices();
// Initialise containers to store the edge conformation locations
DynamicList<Foam::point> newEdgeLocations;
@ -414,7 +414,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
// {
// if
// (
// vit->index() >= startOfSurfacePointPairs_
// vit->index() >= startOfSurfacePoints_
// && vit->internalOrBoundaryPoint()
// )
// {
@ -443,7 +443,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
// // The lower indexed vertex will perform the assessment
// if
// (
// avh->index() >= startOfSurfacePointPairs_
// avh->index() >= startOfSurfacePoints_
// && avh->internalOrBoundaryPoint()
// && vit->index() < avh->index()
// && vit->type() != avh->type()
@ -1583,7 +1583,7 @@ void Foam::conformalVoronoiMesh::storeSurfaceConformation()
surfaceConformationVertices_.setSize
(
number_of_vertices() - startOfSurfacePointPairs_
number_of_vertices() - startOfSurfacePoints_
);
label surfPtI = 0;
@ -1595,7 +1595,7 @@ void Foam::conformalVoronoiMesh::storeSurfaceConformation()
vit++
)
{
if (vit->index() >= startOfSurfacePointPairs_)
if (!vit->referred() && vit->index() >= startOfSurfacePoints_)
{
if (!vit->pairPoint())
{
@ -1607,10 +1607,10 @@ void Foam::conformalVoronoiMesh::storeSurfaceConformation()
surfaceConformationVertices_[surfPtI] = Vb(vit->point());
surfaceConformationVertices_[surfPtI].index() =
vit->index() - startOfSurfacePointPairs_;
vit->index() - startOfSurfacePoints_;
surfaceConformationVertices_[surfPtI].type() =
vit->type() - startOfSurfacePointPairs_;
vit->type() - startOfSurfacePoints_;
surfPtI++;
}
@ -1625,14 +1625,14 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
{
Info<< nl << "Reinserting stored surface conformation" << endl;
startOfSurfacePointPairs_ = number_of_vertices();
startOfSurfacePoints_ = number_of_vertices();
forAll(surfaceConformationVertices_, v)
{
insertVb(surfaceConformationVertices_[v], startOfSurfacePointPairs_);
insertVb(surfaceConformationVertices_[v], startOfSurfacePoints_);
}
Info<< " Reinserted " << number_of_vertices() - startOfSurfacePointPairs_
Info<< " Reinserted " << number_of_vertices() - startOfSurfacePoints_
<< " vertices" << endl;
}