Merge topic 'bump-vtkm'

ab25171e vtk-m: Convert exception on unsupp type
ec81514d Remove call to clean grid filter from Clip
90f60b47 vtk-m: bump vtk-m 2.9.1-rc1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !10439

Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx

@@ -250,7 +250,8 @@ vtkm::cont::DataSet Convert(vtkRectilinearGrid* input, FieldsFlag fields)
 // determine the type and call the proper Convert routine
 vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields)
 {
-  switch (input->GetDataObjectType())
+  auto typeId = input->GetDataObjectType();
+  switch (typeId)
   {
     case VTK_UNSTRUCTURED_GRID:
       return Convert(vtkUnstructuredGrid::SafeDownCast(input), fields);
@@ -267,7 +268,9 @@ vtkm::cont::DataSet Convert(vtkDataSet* input, FieldsFlag fields)
     case VTK_UNSTRUCTURED_GRID_BASE:
     case VTK_STRUCTURED_POINTS:
     default:
-      return vtkm::cont::DataSet();
+      const std::string typeStr = vtkDataObjectTypes::GetClassNameFromTypeId(typeId);
+      const std::string errMsg = "Unable to convert " + typeStr + " to vtkm::cont::DataSet";
+      throw vtkm::cont::ErrorBadType(errMsg);
   }
 }
 

Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx

@@ -31,10 +31,6 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField(vtkm::cont::DataSe
   fieldFilter.SetInvertClip(insideOut);
   auto result = fieldFilter.Execute(in);
 
-  // clean the output to remove unused points
-  vtkm::filter::clean_grid::CleanGrid clean;
-  result = clean.Execute(result);
-
   return result;
 }
 VTK_ABI_NAMESPACE_END

Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx

@@ -24,10 +24,6 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(
   functionFilter.SetInvertClip(insideOut);
   result = functionFilter.Execute(in);
 
-  // clean the output to remove unused points
-  vtkm::filter::clean_grid::CleanGrid clean;
-  result = clean.Execute(result);
-
   return result;
 }
 VTK_ABI_NAMESPACE_END

vtk-m @ 4571db12

-Subproject commit cfd6d3fbe534343d217c2dce47a46763692db0ec
+Subproject commit 4571db1249e0c0667ee1b209c6f13c3462693087