Merge branch 'distributed-contours' of https://gitlab.kitware.com/mingzhefluorite/vtk-m.git into distributed-contours

# Conflicts:
#	vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.cxx
#	vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.h
#	vtkm/filter/scalar_topology/internal/ParentBranchExtremaFunctor.cxx
#	vtkm/filter/scalar_topology/internal/SelectTopVolumeContoursBlock.cxx

vtkm/filter/scalar_topology/SelectTopVolumeContoursFilter.h

@@ -73,6 +73,10 @@ public:
     this->isMarchingCubes = marchingCubes;
   }
 
+  VTKM_CONT const vtkm::Id GetSavedBranches() { return this->nSavedBranches; }
+  VTKM_CONT const bool GetMarchingCubes() { return this->isMarchingCubes; }
+  VTKM_CONT const vtkm::cont::LogLevel GetTimingsLogLevel() { return this->TimingsLogLevel; }
+
 private:
   VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet&) override;
   VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions(

vtkm/filter/scalar_topology/internal/SelectTopVolumeContoursBlock.h

@@ -69,8 +69,16 @@ struct SelectTopVolumeContoursBlock
 {
   SelectTopVolumeContoursBlock(vtkm::Id localBlockNo, int globalBlockId);
 
-  void SortBranchByVolume(const vtkm::cont::DataSet& hierarchicalTreeDataSet,
-                          const vtkm::Id totalVolume);
+  void SortBranchByVolume(const vtkm::cont::DataSet& bdDataSet, const vtkm::Id totalVolume);
+
+  void SelectLocalTopVolumeBranch(const vtkm::cont::DataSet& bdDataSet,
+                                  const vtkm::Id nSavedBranches);
+
+  void ComputeTopVolumeBranchHierarchy(const vtkm::cont::DataSet& bdDataSet);
+
+  void ExtractIsosurfaceOnSelectedBranch(const vtkm::cont::DataSet& bdDataSet,
+                                         const bool isMarchingCubes,
+                                         const vtkm::cont::LogLevel timingsLogLevel);
 
   // Block metadata
   vtkm::Id LocalBlockNo;