diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C index a19b16a672..b83b7ba1a1 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C +++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C @@ -508,66 +508,6 @@ Foam::volumeType Foam::indexedOctree::getSide // -//template -//bool Foam::indexedOctree::findAnyOverlap -//( -// const label nodeI, -// const point& sample, -// const scalar nearestDistSqr -//) const -//{ -// const node& nod = nodes_[nodeI]; -// -// // Determine order to walk through octants -// FixedList octantOrder; -// nod.bb_.searchOrder(sample, octantOrder); -// -// // Go into all suboctants (one containing sample first) and update -// // nearest. -// for (direction i = 0; i < 8; i++) -// { -// direction octant = octantOrder[i]; -// -// labelBits index = nod.subNodes_[octant]; -// -// if (isNode(index)) -// { -// label subNodeI = getNode(index); -// -// const treeBoundBox& subBb = nodes_[subNodeI].bb_; -// -// if (overlaps(subBb.min(), subBb.max(), nearestDistSqr, sample)) -// { -// return findAnyOverlap -// ( -// subNodeI, -// sample, -// nearestDistSqr -// ); -// } -// } -// else if (isContent(index)) -// { -// if -// ( -// overlaps -// ( -// nod.bb_, -// octant, -// nearestDistSqr, -// sample -// ) -// ) -// { -// return true; -// } -// } -// } -// -// return false; -//} - - // Find nearest point starting from nodeI template template @@ -1819,11 +1759,6 @@ Foam::pointIndexHit Foam::indexedOctree::findLine label i = 0; for (; i < 100000; i++) { -// if (isLineInsideOrOutside(nodeI, treeStart, treeEnd)) -// { -// return hitInfo; -// } - // Ray-trace to end of current node. Updates point (either on triangle // in case of hit or on node bounding box in case of miss) @@ -1981,38 +1916,6 @@ Foam::pointIndexHit Foam::indexedOctree::findLine } -//template -//bool Foam::indexedOctree::isLineInsideOrOutside -//( -// const label nodeI, -// const point& start, -// const point& end -//) const -//{ -// const node& nod = nodes_[nodeI]; -// -// direction startOctant = nod.bb_.subOctant(start); -// direction endOctant = nod.bb_.subOctant(end); -// -// if (startOctant == endOctant) -// { -// volumeType startOctantType -// = volumeType(nodeTypes_.get((nodeI<<3) + startOctant)); -// -// if -// ( -// startOctantType == INSIDE || startOctantType == OUTSIDE -// ) -// { -// //Info<< nodeI << " | " << start << " " << end << endl; -// return true; -// } -// } -// -// return false; -//} - - // Find first intersection template template diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H index eaa51c175d..83b773289b 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H +++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H @@ -319,13 +319,6 @@ private: const bool verbose = false ) const; -// bool isLineInsideOrOutside -// ( -// const label nodeI, -// const point& start, -// const point& end -// ) const; - //- Find any or nearest intersection of line between start and end. template pointIndexHit findLine @@ -549,19 +542,6 @@ public: const FindNearestOp& fnOp ) const; -// bool findAnyOverlap -// ( -// const point& sample, -// const scalar nearestDistSqr -// ) const; -// -// bool findAnyOverlap -// ( -// const label nodeI, -// const point& sample, -// const scalar nearestDistSqr -// ) const; - //- Low level: calculate nearest starting from subnode. template void findNearest