songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: treeDataPoint: work with empty subset.

Browse Source
This commit is contained in:
mattijs 2011-04-15 17:24:30 +01:00
parent d60ca66828
commit 592fb7c942
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/meshTools/indexedOctree/treeDataPoint.C
View File

@ -37,7 +37,8 @@ defineTypeNameAndDebug(Foam::treeDataPoint, 0);
Foam::treeDataPoint::treeDataPoint(const pointField& points) Foam::treeDataPoint::treeDataPoint(const pointField& points)
: :
points_(points) points_(points),
useSubset_(false)
{} {}
@ -48,7 +49,8 @@ Foam::treeDataPoint::treeDataPoint
) )
: :
points_(points), points_(points),
pointLabels_(pointLabels) pointLabels_(pointLabels),
useSubset_(true)
{} {}
@ -56,7 +58,7 @@ Foam::treeDataPoint::treeDataPoint
Foam::pointField Foam::treeDataPoint::shapePoints() const Foam::pointField Foam::treeDataPoint::shapePoints() const
{ {
if (pointLabels_.size()) if (useSubset_)
{ {
return pointField(points_, pointLabels_); return pointField(points_, pointLabels_);
} }
@ -86,7 +88,7 @@ bool Foam::treeDataPoint::overlaps
const treeBoundBox& cubeBb const treeBoundBox& cubeBb
) const ) const
{ {
label pointI = (pointLabels_.size() ? pointLabels_[index] : index); label pointI = (useSubset_ ? pointLabels_[index] : index);
return cubeBb.contains(points_[pointI]); return cubeBb.contains(points_[pointI]);
} }
@ -106,7 +108,7 @@ void Foam::treeDataPoint::findNearest
forAll(indices, i) forAll(indices, i)
{ {
const label index = indices[i]; const label index = indices[i];
label pointI = (pointLabels_.size() ? pointLabels_[index] : index); label pointI = (useSubset_ ? pointLabels_[index] : index);
const point& pt = points_[pointI]; const point& pt = points_[pointI];
@ -141,7 +143,7 @@ void Foam::treeDataPoint::findNearest
forAll(indices, i) forAll(indices, i)
{ {
const label index = indices[i]; const label index = indices[i];
label pointI = (pointLabels_.size() ? pointLabels_[index] : index); label pointI = (useSubset_ ? pointLabels_[index] : index);
const point& shapePt = points_[pointI]; const point& shapePt = points_[pointI];

4
src/meshTools/indexedOctree/treeDataPoint.H
View File

@ -65,6 +65,8 @@ class treeDataPoint
//- Subset of points to work on (or empty) //- Subset of points to work on (or empty)
const labelList pointLabels_; const labelList pointLabels_;
const bool useSubset_;
public: public:
// Declare name of the class and its debug switch // Declare name of the class and its debug switch
@ -88,7 +90,7 @@ public:
{ {
return return
( (
pointLabels_.size() useSubset_
? pointLabels_.size() ? pointLabels_.size()
: points_.size() : points_.size()
); );