Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes

This commit is contained in:
ayenpure 2018-12-03 08:07:07 -08:00
commit 7eb0de5b74

@ -36,7 +36,7 @@ namespace cont
class CellLocatorUniformGrid : public vtkm::cont::CellLocator
{
public:
VTKM_EXEC_CONT
VTKM_CONT
CellLocatorUniformGrid() = default;
VTKM_CONT
@ -61,9 +61,6 @@ public:
RangeTransform[2] = static_cast<vtkm::FloatDefault>(celldims[2]) /
static_cast<vtkm::FloatDefault>(Bounds.Z.Length());
// Since we are calculating the cell Id, and the number of cells is
// 1 less than the number of points in each direction, the -1 from dims
// is necessary.
PlaneSize = celldims[0] * celldims[1];
RowSize = celldims[0];
}