Update filters that use FieldCell to use FieldFilter instead

We no longer need to use this deprecated name for a filter class.

vtkm/filter/CellAverage.h

@@ -14,7 +14,7 @@
 #include <vtkm/filter/vtkm_filter_export.h>
 
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 #include <vtkm/worklet/CellAverage.h>
 
 namespace vtkm
@@ -28,7 +28,7 @@ namespace filter
 /// The method of transformation is based on averaging the data
 /// values of all points used by particular cell.
 ///
-class VTKM_ALWAYS_EXPORT CellAverage : public vtkm::filter::FilterCell<CellAverage>
+class VTKM_ALWAYS_EXPORT CellAverage : public vtkm::filter::FilterField<CellAverage>
 {
 public:
   template <typename T, typename StorageType, typename DerivedPolicy>

vtkm/filter/CellMeasures.h

@@ -11,7 +11,7 @@
 #ifndef vtk_m_filter_CellMeasures_h
 #define vtk_m_filter_CellMeasures_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 #include <vtkm/worklet/CellMeasure.h>
 
 namespace vtkm
@@ -27,7 +27,7 @@ namespace filter
 ///
 /// By default, the new cell-data array is named "measure".
 template <typename IntegrationType>
-class CellMeasures : public vtkm::filter::FilterCell<CellMeasures<IntegrationType>>
+class CellMeasures : public vtkm::filter::FilterField<CellMeasures<IntegrationType>>
 {
 public:
   using SupportedTypes = vtkm::TypeListFieldVec3;

vtkm/filter/CellMeasures.hxx

@@ -22,7 +22,7 @@ namespace filter
 //-----------------------------------------------------------------------------
 template <typename IntegrationType>
 inline VTKM_CONT CellMeasures<IntegrationType>::CellMeasures()
-  : vtkm::filter::FilterCell<CellMeasures<IntegrationType>>()
+  : vtkm::filter::FilterField<CellMeasures<IntegrationType>>()
 {
   this->SetUseCoordinateSystemAsField(true);
   this->SetCellMeasureName("measure");

vtkm/filter/ComputeMoments.h

@@ -10,7 +10,7 @@
 #ifndef vtk_m_filter_ComputeMoments_h
 #define vtk_m_filter_ComputeMoments_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 
 namespace vtkm

vtkm/filter/ContourTreeUniform.h

@@ -57,7 +57,7 @@
 #ifndef vtk_m_filter_ContourTreeUniform_h
 #define vtk_m_filter_ContourTreeUniform_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 namespace vtkm
 {
@@ -70,7 +70,7 @@ namespace filter
 /// peak of contour
 /// Based on the algorithm presented in the paper:
 //  “Parallel Peak Pruning for Scalable SMP Contour Tree Computation.”
-class ContourTreeMesh2D : public vtkm::filter::FilterCell<ContourTreeMesh2D>
+class ContourTreeMesh2D : public vtkm::filter::FilterField<ContourTreeMesh2D>
 {
 public:
   using SupportedTypes = TypeListScalarAll;
@@ -92,7 +92,7 @@ public:
 /// peak of contour
 /// Based on the algorithm presented in the paper:
 //  “Parallel Peak Pruning for Scalable SMP Contour Tree Computation.”
-class ContourTreeMesh3D : public vtkm::filter::FilterCell<ContourTreeMesh3D>
+class ContourTreeMesh3D : public vtkm::filter::FilterField<ContourTreeMesh3D>
 {
 public:
   using SupportedTypes = TypeListScalarAll;

vtkm/filter/ContourTreeUniform.hxx

@@ -69,7 +69,7 @@ namespace filter
 
 //-----------------------------------------------------------------------------
 ContourTreeMesh2D::ContourTreeMesh2D()
-  : vtkm::filter::FilterCell<ContourTreeMesh2D>()
+  : vtkm::filter::FilterField<ContourTreeMesh2D>()
 {
   this->SetOutputFieldName("saddlePeak");
 }
@@ -105,7 +105,7 @@ vtkm::cont::DataSet ContourTreeMesh2D::DoExecute(
 }
 //-----------------------------------------------------------------------------
 ContourTreeMesh3D::ContourTreeMesh3D()
-  : vtkm::filter::FilterCell<ContourTreeMesh3D>()
+  : vtkm::filter::FilterField<ContourTreeMesh3D>()
 {
   this->SetOutputFieldName("saddlePeak");
 }

vtkm/filter/ContourTreeUniformAugmented.h

@@ -59,7 +59,7 @@
 #include <vtkm/worklet/contourtree_augmented/ContourTree.h>
 #include <vtkm/worklet/contourtree_distributed/MultiBlockContourTreeHelper.h>
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 #include <memory>
 
@@ -83,7 +83,7 @@ namespace filter
 /// tree are merged progressively using a binary-reduction scheme to compute the
 /// final contour tree. I.e., in the multi-block context, the final tree is
 /// constructed on rank 0.
-class ContourTreeAugmented : public vtkm::filter::FilterCell<ContourTreeAugmented>
+class ContourTreeAugmented : public vtkm::filter::FilterField<ContourTreeAugmented>
 {
 public:
   using SupportedTypes = vtkm::TypeListScalarAll;

vtkm/filter/ContourTreeUniformAugmented.hxx

@@ -103,7 +103,7 @@ struct PostExecuteCaller
 //-----------------------------------------------------------------------------
 ContourTreeAugmented::ContourTreeAugmented(bool useMarchingCubes,
                                            unsigned int computeRegularStructure)
-  : vtkm::filter::FilterCell<ContourTreeAugmented>()
+  : vtkm::filter::FilterField<ContourTreeAugmented>()
   , UseMarchingCubes(useMarchingCubes)
   , ComputeRegularStructure(computeRegularStructure)
   , MultiBlockTreeHelper(nullptr)

vtkm/filter/ContourTreeUniformDistributed.h

@@ -59,7 +59,7 @@
 #include <vtkm/worklet/contourtree_augmented/ContourTree.h>
 #include <vtkm/worklet/contourtree_distributed/MultiBlockContourTreeHelper.h>
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 #include <memory>
 
@@ -83,7 +83,8 @@ namespace filter
 /// tree are merged progressively using a binary-reduction scheme to compute the
 /// final contour tree. I.e., in the multi-block context, the final tree is
 /// constructed on rank 0.
-class ContourTreeUniformDistributed : public vtkm::filter::FilterCell<ContourTreeUniformDistributed>
+class ContourTreeUniformDistributed
+  : public vtkm::filter::FilterField<ContourTreeUniformDistributed>
 {
 public:
   using SupportedTypes = vtkm::TypeListScalarAll;

vtkm/filter/Gradient.h

@@ -13,7 +13,7 @@
 
 #include <vtkm/filter/vtkm_filter_export.h>
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 namespace vtkm
 {
@@ -29,7 +29,7 @@ namespace filter
 ///
 /// Note: If no explicit name for the output field is provided the filter will
 /// default to "Gradients"
-class Gradient : public vtkm::filter::FilterCell<Gradient>
+class Gradient : public vtkm::filter::FilterField<Gradient>
 {
 public:
   using SupportedTypes = vtkm::List<vtkm::Float32, vtkm::Float64, vtkm::Vec3f_32, vtkm::Vec3f_64>;

vtkm/filter/ImageConnectivity.h

@@ -11,7 +11,7 @@
 #ifndef vtk_m_filter_ImageConnectivity_h
 #define vtk_m_filter_ImageConnectivity_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 #include <vtkm/worklet/connectivities/ImageConnectivity.h>
 
 /// \brief Groups connected points that have the same field value
@@ -28,7 +28,7 @@ namespace vtkm
 {
 namespace filter
 {
-class ImageConnectivity : public vtkm::filter::FilterCell<ImageConnectivity>
+class ImageConnectivity : public vtkm::filter::FilterField<ImageConnectivity>
 {
 public:
   using SupportedTypes = vtkm::TypeListScalarAll;

vtkm/filter/ImageMedian.h

@@ -11,7 +11,7 @@
 #ifndef vtk_m_filter_ImageMedian_h
 #define vtk_m_filter_ImageMedian_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 /// \brief Median algorithm for general image blur
 ///

vtkm/filter/PointAverage.h

@@ -15,7 +15,7 @@
 
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
 #include <vtkm/cont/CellSetExtrude.h>
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 #include <vtkm/worklet/PointAverage.h>
 
 namespace vtkm
@@ -28,7 +28,7 @@ namespace filter
 /// specified per cell) into point data (i.e., data specified at cell
 /// points). The method of transformation is based on averaging the data
 /// values of all cells using a particular point.
-class VTKM_ALWAYS_EXPORT PointAverage : public vtkm::filter::FilterCell<PointAverage>
+class VTKM_ALWAYS_EXPORT PointAverage : public vtkm::filter::FilterField<PointAverage>
 {
 public:
   template <typename T, typename StorageType, typename DerivedPolicy>

vtkm/filter/SurfaceNormals.h

@@ -10,7 +10,7 @@
 #ifndef vtk_m_filter_SurfaceNormals_h
 #define vtk_m_filter_SurfaceNormals_h
 
-#include <vtkm/filter/FilterCell.h>
+#include <vtkm/filter/FilterField.h>
 
 namespace vtkm
 {
@@ -23,7 +23,7 @@ namespace filter
 /// The cell normals are faceted and are computed based on the plane where a
 /// face lies. The point normals are smooth normals, computed by averaging
 /// the face normals of incident cells.
-class SurfaceNormals : public vtkm::filter::FilterCell<SurfaceNormals>
+class SurfaceNormals : public vtkm::filter::FilterField<SurfaceNormals>
 {
 public:
   using SupportedTypes = vtkm::TypeListFieldVec3;