From 42a3602ed64334406655a7c4e0d1dfff97f4bc48 Mon Sep 17 00:00:00 2001 From: Steven Walton Date: Thu, 30 May 2019 15:09:02 -0700 Subject: [PATCH] Had missed a few unused variables when fixing rebase issues. --- vtkm/worklet/ExtractStructured.h | 1 - vtkm/worklet/testing/UnitTestExtractStructured.cxx | 4 ---- 2 files changed, 5 deletions(-) diff --git a/vtkm/worklet/ExtractStructured.h b/vtkm/worklet/ExtractStructured.h index 77f7b120b..862db553c 100644 --- a/vtkm/worklet/ExtractStructured.h +++ b/vtkm/worklet/ExtractStructured.h @@ -461,7 +461,6 @@ public: this->OutputDimensions[i] = ((voiDims[i] + this->SampleRate[i] - 1) / this->SampleRate[i]) + ((includeBoundary && ((voiDims[i] - 1) % this->SampleRate[i])) ? 1 : 0); } - this->ValidPoints = vtkm::cont::make_ArrayHandleCartesianProduct( MakeAxisIndexArrayPoints(this->OutputDimensions[0], this->VOI.X.Min, diff --git a/vtkm/worklet/testing/UnitTestExtractStructured.cxx b/vtkm/worklet/testing/UnitTestExtractStructured.cxx index e1ea03abc..039448956 100644 --- a/vtkm/worklet/testing/UnitTestExtractStructured.cxx +++ b/vtkm/worklet/testing/UnitTestExtractStructured.cxx @@ -288,11 +288,9 @@ public: vtkm::RangeId3 range(100, 110, 0, 10, 0, 10); vtkm::Id3 sample(1, 1, 1); vtkm::Id3 test_dims(0, 0, 0); - const vtkm::Int32 Dimensionality = 3; bool includeBoundary = false; bool includeOffset = true; cellSet.SetPointDimensions(vtkm::make_Vec(10, 10, 10)); - vtkm::Vec ptdim(cellSet.GetPointDimensions()); vtkm::worklet::ExtractStructured worklet; auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset); @@ -310,11 +308,9 @@ public: vtkm::Id2 test_offset(10, 0); vtkm::Id2 no_offset(0, 0); vtkm::Id2 new_dims(5, 10); - const vtkm::Int32 Dimensionality = 2; bool includeBoundary = false; bool includeOffset = false; cellSet.SetPointDimensions(vtkm::make_Vec(10, 10)); - vtkm::Vec ptdim(cellSet.GetPointDimensions()); vtkm::worklet::ExtractStructured worklet; auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset); VTKM_TEST_ASSERT(test_equal(cellSet.GetGlobalPointIndexStart(), no_offset)); -- GitLab