ENH: moved indexedOctree and treeBoundBox from meshTools to OpenFOAM

src/OpenFOAM/Make/files

@@ -500,6 +500,8 @@ $(pointBoundaryMesh)/pointBoundaryMesh.C
 
 meshes/boundBox/boundBox.C
 
+meshes/treeBoundBox/treeBoundBox.C
+
 meshTools = meshes/meshTools
 $(meshTools)/matchPoints.C
 $(meshTools)/mergePoints.C
@@ -577,6 +579,11 @@ $(interpolations)/patchToPatchInterpolation/PatchToPatchInterpolationName.C
 algorithms/MeshWave/MeshWaveName.C
 algorithms/MeshWave/FaceCellWaveName.C
 
+algorithms/indexedOctree/indexedOctreeName.C
+algorithms/indexedOctree/treeDataCell.C
+
+
+
 graph/curve/curve.C
 graph/graph.C
 

src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C

@@ -25,8 +25,8 @@ License
 
 #include "indexedOctree.H"
 #include "linePointRef.H"
-#include "meshTools.H"
 #include "OFstream.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1730,26 +1730,6 @@ void Foam::indexedOctree<Type>::traverseNode
 
         point perturbedEnd(pushPoint(octantBb, end, false));
 
-
-        //if (debug)
-        {
-            // Dump octantBb to obj
-            writeOBJ(nodeI, octant);
-            // Dump ray to obj as well
-            {
-                OFstream str("ray.obj");
-                meshTools::writeOBJ(str, start);
-                meshTools::writeOBJ(str, end);
-                str << "l 1 2" << nl;
-            }
-            WarningIn("indexedOctree<Type>::traverseNode(..)")
-                << "Did not intersect ray from endpoint:" << end
-                << " to startpoint:" << start
-                << " with bounding box:" << octantBb << nl
-                << "Re-intersecting with perturbed endpoint:" << perturbedEnd
-                << endl;
-        }
-
         traverseNode
         (
             findAny,
@@ -2316,12 +2296,6 @@ void Foam::indexedOctree<Type>::writeOBJ
     pointField bbPoints(subBb.points());
 
     label pointVertI = vertI;
-    forAll(bbPoints, i)
-    {
-        meshTools::writeOBJ(str, bbPoints[i]);
-        vertI++;
-    }
-
     forAll(treeBoundBox::edges, i)
     {
         const edge& e = treeBoundBox::edges[i];

src/OpenFOAM/algorithms/indexedOctree/indexedOctreeName.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/algorithms/indexedOctree/labelBits.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxList.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License