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: indexedOctree: removed commented out code

Browse Source
This commit is contained in:
mattijs
2013-07-10 12:29:07 +01:00
parent a11a6867c7
commit f9664eb3e4
2 changed files with 0 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
View File

@ -508,66 +508,6 @@ Foam::volumeType Foam::indexedOctree<Type>::getSide
// //
//template<class Type>
//bool Foam::indexedOctree<Type>::findAnyOverlap
//(
// const label nodeI,
// const point& sample,
// const scalar nearestDistSqr
//) const
//{
// const node& nod = nodes_[nodeI];
//
// // Determine order to walk through octants
// FixedList<direction, 8> 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 // Find nearest point starting from nodeI
template<class Type> template<class Type>
template<class FindNearestOp> template<class FindNearestOp>
@ -1819,11 +1759,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
label i = 0; label i = 0;
for (; i < 100000; i++) for (; i < 100000; i++)
{ {
// if (isLineInsideOrOutside(nodeI, treeStart, treeEnd))
// {
// return hitInfo;
// }
// Ray-trace to end of current node. Updates point (either on triangle // 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) // in case of hit or on node bounding box in case of miss)
@ -1981,38 +1916,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
} }
//template<class Type>
//bool Foam::indexedOctree<Type>::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 // Find first intersection
template<class Type> template<class Type>
template<class FindIntersectOp> template<class FindIntersectOp>

20
src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
View File

@ -319,13 +319,6 @@ private:
const bool verbose = false const bool verbose = false
) const; ) const;
// bool isLineInsideOrOutside
// (
// const label nodeI,
// const point& start,
// const point& end
// ) const;
//- Find any or nearest intersection of line between start and end. //- Find any or nearest intersection of line between start and end.
template<class FindIntersectOp> template<class FindIntersectOp>
pointIndexHit findLine pointIndexHit findLine
@ -549,19 +542,6 @@ public:
const FindNearestOp& fnOp const FindNearestOp& fnOp
) const; ) 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. //- Low level: calculate nearest starting from subnode.
template<class FindNearestOp> template<class FindNearestOp>
void findNearest void findNearest