BUG: Wrong index specification.

Output tweaks and unused variable removal.
This commit is contained in:
graham
2011-06-13 18:14:00 +01:00
parent 17314265fc
commit 3d5661fe73
4 changed files with 43 additions and 10 deletions

View File

@ -365,7 +365,9 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
// Each of points generated in this process are pair points, so there
// is no risk of underflowing type.
Pout<< "Suface point pair points before " << pts.size() << endl;
// Pout<< "Suface point pair points before "
// << pts.size() << " " << indices.size() << " " << types.size()
// << endl;
// Distribute points to their appropriate processor
autoPtr<mapDistribute> map
@ -373,12 +375,19 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
decomposition_().distributePoints(pts)
);
Pout<< "Suface point pair points after " << pts.size() << endl;
map().distribute(indices);
map().distribute(types);
// Pout<< "Suface point pair points after "
// << pts.size() << " " << indices.size() << " " << types.size()
// << endl;
// Info<< returnReduce(pts.size(), sumOp<label>())
// << " points generated" << endl;
}
Info<< "USING INDEX IS POINTLESS, IT IS ALWAYS ZERO" << endl;
forAll(pts, pI)
{
// creation of points and indices is done assuming that it will be

View File

@ -267,6 +267,15 @@ private:
bool distribute = true
);
//- Insert a point-pair at a ppDist distance either side of
// surface point surfPt, in the direction n
inline void insertPointPair
(
const scalar ppDist,
const Foam::point& surfPt,
const vector& n
);
//- Create a point-pair at a ppDist distance either side of
// surface point surfPt, in the direction n
inline void createPointPair

View File

@ -616,8 +616,6 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceAll
{
// Refer all points to all processors
boolList sendToProc(Pstream::nProcs(), false);
DynamicList<Foam::point> parallelAllPoints;
DynamicList<label> targetProcessor;
DynamicList<label> parallelAllIndices;
@ -684,8 +682,6 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceIntersection
const word& outputName
)
{
boolList sendToProc(Pstream::nProcs(), false);
DynamicList<Foam::point> parallelIntersectionPoints;
DynamicList<label> targetProcessor;
DynamicList<label> parallelIntersectionIndices;
@ -1141,7 +1137,7 @@ void Foam::conformalVoronoiMesh::referVertices
}
}
Info<< " total " << stageName << " vertices " << totalVertices << endl;
Info<< " Total " << stageName << " vertices " << totalVertices << endl;
}

View File

@ -257,6 +257,25 @@ inline void Foam::conformalVoronoiMesh::insertPoint
}
inline void Foam::conformalVoronoiMesh::insertPointPair
(
const scalar ppDist,
const Foam::point& surfPt,
const vector& n
)
{
vector ppDistn = ppDist*n;
label master = insertPoint
(
surfPt - ppDistn,
number_of_vertices() + 1
);
insertPoint(surfPt + ppDistn, master);
}
inline void Foam::conformalVoronoiMesh::createPointPair
(
const scalar ppDist,
@ -276,8 +295,8 @@ inline void Foam::conformalVoronoiMesh::createPointPair
// Slave
pts.append(surfPt + ppDistn);
types.append(1);
types.append(0);
indices.append(0);
types.append(-1);
}