ENH: use simpler constructor forms for treeData types

applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C

@@ -67,17 +67,10 @@ int main(int argc, char *argv[])
     treeBoundBox bb(efem.points());
     bb.grow(ROOTVSMALL);
 
-    labelList allEdges(identity(efem.edges().size()));
-
     indexedOctree<treeDataEdge> edgeTree
     (
-        treeDataEdge
+        treeDataEdge(efem.edges(), efem.points()),   // All edges
-        (
+
-            false,          // cachebb
-            efem.edges(),        // edges
-            efem.points(),       // points
-            allEdges        // selected edges
-        ),
         bb,     // bb
         8,      // maxLevel
         10,     // leafsize

applications/utilities/surface/surfaceHookUp/surfaceHookUp.C

@@ -166,11 +166,7 @@ void createBoundaryEdgeTrees
 
         // Boundary edges
         treeBoundaryEdges[surfI] =
-            identity
+            identity(surf.nBoundaryEdges(), surf.nInternalEdges());
-            (
-                surf.nEdges() - surf.nInternalEdges(),
-                surf.nInternalEdges()
-            );
 
         Random rndGen(17301893);
 
@@ -188,9 +184,8 @@ void createBoundaryEdgeTrees
             (
                 treeDataEdge
                 (
-                    false,                      // cachebb
+                    surf.edges(),
-                    surf.edges(),               // edges
+                    surf.localPoints(),
-                    surf.localPoints(),         // points
                     treeBoundaryEdges[surfI]    // selected edges
                 ),
                 bb,     // bb

src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C

@@ -989,23 +989,20 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster
 )
 {
     // Construct octree from all mesh0 boundary faces
-    labelList bndFaces
-    (
-        identity(mesh0.nBoundaryFaces(), mesh0.nInternalFaces())
-    );
-
-    treeBoundBox overallBb(mesh0.points());
 
     Random rndGen(123456);
 
+    treeBoundBox overallBb(mesh0.points());
+
     indexedOctree<treeDataFace> tree
     (
-        treeDataFace    // all information needed to search faces
+        treeDataFace
         (
-            false,                      // do not cache bb
             mesh0,
-            bndFaces                    // boundary faces only
+            // boundary faces only
+            identity(mesh0.nBoundaryFaces(), mesh0.nInternalFaces())
         ),
+
         overallBb.extend(rndGen, 1e-4), // overall search domain
         8,                              // maxLevel
         10,                             // leafsize

src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C

@@ -304,13 +304,8 @@ void Foam::refinementFeatures::buildTrees(const label featI)
         featI,
         new indexedOctree<treeDataEdge>
         (
-            treeDataEdge
+            treeDataEdge(edges, points),  // All edges
-            (
+
-                false,                  // do not cache bb
-                edges,
-                points,
-                identity(edges.size())
-            ),
             bb,     // overall search domain
             8,      // maxLevel
             10,     // leafsize
@@ -327,6 +322,7 @@ void Foam::refinementFeatures::buildTrees(const label featI)
         new indexedOctree<treeDataPoint>
         (
             treeDataPoint(points, featurePoints),
+
             bb,     // overall search domain
             8,      // maxLevel
             10,     // leafsize
@@ -443,13 +439,8 @@ Foam::refinementFeatures::regionEdgeTrees() const
                 featI,
                 new indexedOctree<treeDataEdge>
                 (
-                    treeDataEdge
+                    treeDataEdge(edges, points, eMesh.regionEdges()),
-                    (
+
-                        false,                  // do not cache bb
-                        edges,
-                        points,
-                        eMesh.regionEdges()
-                    ),
                     bb,     // overall search domain
                     8,      // maxLevel
                     10,     // leafsize

src/meshTools/cellClassification/cellClassification.C

@@ -167,7 +167,7 @@ Foam::boolList Foam::cellClassification::markFaces
 
     indexedOctree<treeDataFace> faceTree
     (
-        treeDataFace(false, mesh_, allFaces),
+        treeDataFace(mesh_, allFaces),
         allBb,      // overall search domain
         8,          // maxLevel
         10,         // leafsize

src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C

@@ -815,11 +815,8 @@ Foam::extendedEdgeMesh::pointTree() const
         (
             new indexedOctree<treeDataPoint>
             (
-                treeDataPoint
+                treeDataPoint(points(), featurePointLabels),
-                (
+
-                    points(),
-                    featurePointLabels
-                ),
                 bb,     // bb
                 8,      // maxLevel
                 10,     // leafsize
@@ -846,19 +843,12 @@ Foam::extendedEdgeMesh::edgeTree() const
             treeBoundBox(points()).extend(rndGen, 1e-4, ROOTVSMALL)
         );
 
-        labelList allEdges(identity(edges().size()));
-
         edgeTree_.reset
         (
             new indexedOctree<treeDataEdge>
             (
-                treeDataEdge
+                treeDataEdge(edges(), points()),  // All edges
-                (
+
-                    false,          // cachebb
-                    edges(),        // edges
-                    points(),       // points
-                    allEdges        // selected edges
-                ),
                 bb,     // bb
                 8,      // maxLevel
                 10,     // leafsize
@@ -885,24 +875,22 @@ Foam::extendedEdgeMesh::edgeTreesByType() const
             treeBoundBox(points()).extend(rndGen, 1e-4, ROOTVSMALL)
         );
 
-        labelListList sliceEdges(nEdgeTypes);
+        List<labelRange> sliceEdges(nEdgeTypes);
 
         // External edges
-        sliceEdges[0] =
+        sliceEdges[0].reset(externalStart_, (internalStart_ - externalStart_));
-            identity((internalStart_ - externalStart_), externalStart_);
 
         // Internal edges
-        sliceEdges[1] = identity((flatStart_ - internalStart_), internalStart_);
+        sliceEdges[1].reset(internalStart_, (flatStart_ - internalStart_));
 
         // Flat edges
-        sliceEdges[2] = identity((openStart_ - flatStart_), flatStart_);
+        sliceEdges[2].reset(flatStart_, (openStart_ - flatStart_));
 
         // Open edges
-        sliceEdges[3] = identity((multipleStart_ - openStart_), openStart_);
+        sliceEdges[3].reset(openStart_, (multipleStart_ - openStart_));
 
         // Multiple edges
-        sliceEdges[4] =
+        sliceEdges[4].reset(multipleStart_, (edges().size() - multipleStart_));
-            identity((edges().size() - multipleStart_), multipleStart_);
 
 
         edgeTreesByType_.resize(nEdgeTypes);
@@ -914,13 +902,9 @@ Foam::extendedEdgeMesh::edgeTreesByType() const
                 i,
                 new indexedOctree<treeDataEdge>
                 (
-                    treeDataEdge
+                    // Selected edges
-                    (
+                    treeDataEdge(edges(), points(), sliceEdges[i]),
-                        false,          // cachebb
+
-                        edges(),        // edges
-                        points(),       // points
-                        sliceEdges[i]   // selected edges
-                    ),
                     bb,     // bb
                     8,      // maxLevel
                     10,     // leafsize

src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C

@@ -403,12 +403,8 @@ void Foam::mappedPatchBase::findLocalSamples
 
                 indexedOctree<treeDataFace> boundaryTree
                 (
-                    treeDataFace    // all information needed to search faces
+                    treeDataFace(mesh, pp.range()),  // Patch faces
-                    (
+
-                        false,      // do not cache bb
-                        mesh,
-                        identity(pp.range())  // boundary faces only
-                    ),
                     patchBb,        // overall search domain
                     8,              // maxLevel
                     10,             // leafsize
@@ -479,11 +475,9 @@ void Foam::mappedPatchBase::findLocalSamples
 
                 indexedOctree<treeDataPoint> boundaryTree
                 (
-                    treeDataPoint   // all information needed to search faces
+                    // Patch points
-                    (
+                    treeDataPoint(mesh.points(), pp.meshPoints()),
-                        mesh.points(),
+
-                        pp.meshPoints() // selection of points to search on
-                    ),
                     patchBb,        // overall search domain
                     8,              // maxLevel
                     10,             // leafsize

src/meshTools/meshSearch/meshSearch.C

@@ -628,12 +628,8 @@ Foam::meshSearch::boundaryTree() const
         (
             new indexedOctree<treeDataFace>
             (
-                treeDataFace    // all information needed to search faces
+                treeDataFace(mesh_, bndFaces),  // Boundary faces
-                (
+
-                    false,                      // do not cache bb
-                    mesh_,
-                    bndFaces                    // boundary faces only
-                ),
                 dataBoundBox(),                 // overall search domain
                 8,                              // maxLevel
                 10,                             // leafsize
@@ -668,18 +664,14 @@ Foam::meshSearch::nonCoupledBoundaryTree() const
                 }
             }
         }
-        bndFaces.setSize(bndi);
+        bndFaces.resize(bndi);
 
         nonCoupledBoundaryTreePtr_.reset
         (
             new indexedOctree<treeDataFace>
             (
-                treeDataFace    // all information needed to search faces
+                treeDataFace(mesh_, bndFaces),  // Boundary faces
-                (
+
-                    false,                      // do not cache bb
-                    mesh_,
-                    bndFaces                    // boundary faces only
-                ),
                 dataBoundBox(),                 // overall search domain
                 8,                              // maxLevel
                 10,                             // leafsize

src/meshTools/searchableSurfaces/searchableExtrudedCircle/searchableExtrudedCircle.C

@@ -104,13 +104,8 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle
     (
         new indexedOctree<treeDataEdge>
         (
-            treeDataEdge
+            treeDataEdge(edges, points),   // All edges
-            (
+
-                false,                  // do not cache bb
-                edges,
-                points,
-                identity(edges.size())
-            ),
             bb,     // overall search domain
             8,      // maxLevel
             10,     // leafsize

src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C

@@ -768,10 +768,7 @@ Foam::triSurfaceMesh::edgeTree() const
         }
 
         // Boundary edges
-        labelList bEdges
+        const labelRange bEdges(nInternalEdges(), nBoundaryEdges());
-        (
-            identity(nEdges() - nInternalEdges(), nInternalEdges())
-        );
 
         treeBoundBox bb(point::zero);
 
@@ -808,13 +805,9 @@ Foam::triSurfaceMesh::edgeTree() const
         (
             new indexedOctree<treeDataEdge>
             (
-                treeDataEdge
+                // Boundary edges
-                (
+                treeDataEdge(edges(), localPoints(), bEdges),
-                    false,          // cachebb
+
-                    edges(),        // edges
-                    localPoints(),  // points
-                    bEdges          // selected edges
-                ),
                 bb,                 // bb
                 maxTreeDepth(),     // maxLevel
                 10,                 // leafsize

src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C

@@ -1243,13 +1243,13 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
 {
     // Build tree out of all samples.
 
-    // Note: cannot be done one the fly - gcc4.4 compiler bug.
+    // Define bound box here (gcc-4.8.5)
-    treeBoundBox bb(samples);
+    const treeBoundBox overallBb(samples);
 
     indexedOctree<treeDataPoint> ppTree
     (
-        treeDataPoint(samples),   // all information needed to do checks
+        treeDataPoint(samples),
-        bb,                       // overall search domain
+        overallBb,
         8,      // maxLevel
         10,     // leafsize
         3.0     // duplicity
@@ -1330,13 +1330,13 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
 
     scalar maxSearchSqr = max(maxDistSqr);
 
-    //Note: cannot be done one the fly - gcc4.4 compiler bug.
+    // Define bound box here (gcc-4.8.5)
-    treeBoundBox bb(samples);
+    const treeBoundBox overallBb(samples);
 
     indexedOctree<treeDataPoint> ppTree
     (
-        treeDataPoint(samples),   // all information needed to do checks
+        treeDataPoint(samples),
-        bb,                         // overall search domain
+        overallBb,
         8,      // maxLevel
         10,     // leafsize
         3.0     // duplicity
@@ -1468,11 +1468,10 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
     (
         treeDataEdge
         (
-            false,
             sampleEdges,
             samplePoints,
             selectedSampleEdges
-        ),                          // geometric info container for edges
+        ),
         treeBoundBox(samplePoints), // overall search domain
         8,      // maxLevel
         10,     // leafsize
@@ -1626,11 +1625,10 @@ void Foam::surfaceFeatures::nearestSurfEdge
     (
         treeDataEdge
         (
-            false,
             surf_.edges(),
             localPoints,
             selectedEdges
-        ),          // all information needed to do geometric checks
+        ),
         searchDomain,  // overall search domain
         8,      // maxLevel
         10,     // leafsize
@@ -1694,11 +1692,10 @@ void Foam::surfaceFeatures::nearestSurfEdge
     (
         treeDataEdge
         (
-            false,
             surf_.edges(),
             surf_.localPoints(),
             selectedEdges
-        ),              // all information needed to do geometric checks
+        ),
         searchDomain,   // overall search domain
         8,              // maxLevel
         10,             // leafsize
@@ -1751,13 +1748,8 @@ void Foam::surfaceFeatures::nearestFeatEdge
 
     indexedOctree<treeDataEdge> ppTree
     (
-        treeDataEdge
+        treeDataEdge(edges, points),  // All edges
-        (
+
-            false,
-            edges,
-            points,
-            identity(edges.size())
-        ),          // all information needed to do geometric checks
         searchDomain,  // overall search domain
         8,      // maxLevel
         10,     // leafsize

src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C

@@ -165,7 +165,6 @@ Foam::triSurfaceRegionSearch::treeByRegion() const
                 (
                     treeDataIndirectTriSurface
                     (
-                        false,              //true,
                         indirectRegionPatches_[regionI],
                         tolerance()
                     ),

src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C

@@ -240,7 +240,7 @@ Foam::triSurfaceSearch::tree() const
         (
             new indexedOctree<treeDataTriSurface>
             (
-                treeDataTriSurface(false, surface_, tolerance_),
+                treeDataTriSurface(surface_, tolerance_),
                 bb,
                 maxTreeDepth_,  // maxLevel
                 10,             // leafsize

src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C

@@ -90,7 +90,7 @@ void Foam::meshToMesh0::calcAddressing()
 
     indexedOctree<treeDataCell> cellTree
     (
-        treeDataCell(false, fromMesh_, polyMesh::CELL_TETS),
+        treeDataCell(fromMesh_, polyMesh::CELL_TETS),
         shiftedBb,      // overall bounding box
         8,              // maxLevel
         10,             // leafsize
@@ -162,7 +162,7 @@ void Foam::meshToMesh0::calcAddressing()
                 // is not as big as all boundary faces
                 indexedOctree<treeDataFace> faceTree
                 (
-                    treeDataFace(false, fromPatch),
+                    treeDataFace(fromPatch),
                     shiftedBb,  // overall search domain
                     12,         // maxLevel
                     10,         // leafsize

src/sampling/probes/patchProbes.C

@@ -93,12 +93,8 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
         const indexedOctree<treeDataFace> boundaryTree
         (
-            treeDataFace    // all information needed to search faces
+            treeDataFace(mesh, bndFaces),  // patch faces only
-            (
+
-                false,      // do not cache bb
-                mesh,
-                bndFaces    // patch faces only
-            ),
             overallBb,      // overall search domain
             8,              // maxLevel
             10,             // leafsize

src/sampling/sampledSet/patchCloud/patchCloudSet.C

@@ -94,12 +94,8 @@ void Foam::patchCloudSet::calcSamples
 
     indexedOctree<treeDataFace> patchTree
     (
-        treeDataFace    // all information needed to search faces
+        treeDataFace(mesh(), patchFaces),  // boundary faces only
-        (
+
-            false,      // do not cache bb
-            mesh(),
-            patchFaces  // boundary faces only
-        ),
         bb,             // overall search domain
         8,              // maxLevel
         10,             // leafsize

src/sampling/sampledSet/patchSeed/patchSeedSet.C

@@ -114,12 +114,8 @@ void Foam::patchSeedSet::calcSamples
 
             indexedOctree<treeDataFace> boundaryTree
             (
-                treeDataFace    // all information needed to search faces
+                treeDataFace(mesh(), patchFaces),  // boundary faces only
-                (
+
-                    false,      // do not cache bb
-                    mesh(),
-                    patchFaces  // boundary faces only
-                ),
                 patchBb,        // overall search domain
                 8,              // maxLevel
                 10,             // leafsize