diff --git a/vtkm/cont/CoordinateSystem.h b/vtkm/cont/CoordinateSystem.h index 0941eb96e..4a36c70b4 100644 --- a/vtkm/cont/CoordinateSystem.h +++ b/vtkm/cont/CoordinateSystem.h @@ -60,6 +60,9 @@ public: vtkm::Vec origin = vtkm::Vec(0.0f, 0.0f, 0.0f), vtkm::Vec spacing = vtkm::Vec(1.0f, 1.0f, 1.0f)); + VTKM_CONT + vtkm::Id GetNumberOfPoints() const { return this->GetNumberOfValues(); } + VTKM_CONT vtkm::cont::ArrayHandleVirtualCoordinates GetData() const; @@ -80,7 +83,15 @@ public: } VTKM_CONT - const vtkm::cont::ArrayHandle& GetRange() const + vtkm::Vec GetRange() const + { + vtkm::Vec range; + this->GetRange(&range[0]); + return range; + } + + VTKM_CONT + vtkm::cont::ArrayHandle GetRangeAsArrayHandle() const { return this->Superclass::GetRange(CoordinatesTypeList()); } diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h index 6f4d0c0bb..c1ad187ff 100644 --- a/vtkm/cont/Field.h +++ b/vtkm/cont/Field.h @@ -128,6 +128,7 @@ public: const vtkm::cont::VariantArrayHandle& GetData() const; vtkm::cont::VariantArrayHandle& GetData(); + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Data.GetNumberOfValues(); } template VTKM_CONT void GetRange(vtkm::Range* range, TypeList) const