Move PointDoubling to meshextrema submodule since only used in MeshExtrema.h

vtkm/worklet/contourtree_augmented/CMakeLists.txt

@@ -16,7 +16,6 @@ set(headers
   DataSetMesh.h
   MergeTree.h
   MeshExtrema.h
-  PointerDoubling.h
   PrintVectors.h
   ProcessContourTree.h
   Types.h

vtkm/worklet/contourtree_augmented/MeshExtrema.h

@@ -59,9 +59,9 @@
 #include <vtkm/cont/Algorithm.h>
 #include <vtkm/cont/ArrayHandleConstant.h>
 #include <vtkm/cont/Invoker.h>
-#include <vtkm/worklet/contourtree_augmented/PointerDoubling.h>
 #include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
 #include <vtkm/worklet/contourtree_augmented/Types.h>
+#include <vtkm/worklet/contourtree_augmented/meshextrema/PointerDoubling.h>
 #include <vtkm/worklet/contourtree_augmented/meshextrema/SetStarts.h>
 
 
@@ -134,7 +134,7 @@ inline void MeshExtrema::BuildRegularChains(bool isMaximal)
   IdArrayType& extrema = isMaximal ? Peaks : Pits;
 
   // Create the PointerDoubling worklet and corresponding dispatcher
-  vtkm::worklet::contourtree_augmented::PointerDoubling pointerDoubler;
+  vtkm::worklet::contourtree_augmented::mesh_extrema_inc::PointerDoubling pointerDoubler;
 
   // Iterate to perform pointer-doubling to build chains to extrema (i.e., maxima or minima)
   // depending on whether we are computing a JoinTree or a SplitTree

vtkm/worklet/contourtree_augmented/meshextrema/CMakeLists.txt

@@ -9,7 +9,8 @@
 ##============================================================================
 set(headers
   SetStarts.h
-  )
+  PointerDoubling.h
+)
 
 #-----------------------------------------------------------------------------
 vtkm_declare_headers(${headers})

vtkm/worklet/contourtree_augmented/meshextrema/PointerDoubling.h

@@ -63,6 +63,8 @@ namespace worklet
 {
 namespace contourtree_augmented
 {
+namespace mesh_extrema_inc
+{
 
 // Functor for doing chain doubling
 // Unary because it takes the index of the element to process, and is not guaranteed to
@@ -94,6 +96,7 @@ public:
   }
 }; // PointerDoubling
 
+} // namespace mesh_extrema_inc
 } // namespace contourtree_augmented
 } // namespace worklet
 } // namespace vtkm