Merge topic 'express_threshold_scalar_req'

856b8b54 Express in the the threshold filter policy it only handles scalars.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !500

vtkm/filter/Threshold.h

@@ -68,6 +68,14 @@ private:
   vtkm::cont::ArrayHandle<vtkm::Id> ValidCellIds;
 };
 
+template<>
+class FilterTraits<Threshold>
+{ //currently the threshold filter only works on scalar data.
+public:
+  typedef TypeListTagScalarAll InputFieldTypeList;
+};
+
+
 }
 } // namespace vtkm::filter
 

vtkm/worklet/Threshold.h

@@ -43,7 +43,7 @@ public:
   {
   public:
     typedef void ControlSignature(CellSetIn cellset,
-                                  FieldInPoint<Scalar> scalars,
+                                  FieldInPoint<ScalarAll> scalars,
                                   FieldOutCell<BoolType> passFlags);
 
     typedef _3 ExecutionSignature(_2, PointCount);