From aadd30733276cf6740dd0dfb859e6a4c1322d18e Mon Sep 17 00:00:00 2001 From: Jeremy Meredith Date: Wed, 15 Apr 2015 11:07:37 -0400 Subject: [PATCH] renaming to fix build errors. --- vtkm/cont/DataSet.h | 2 +- vtkm/cont/RegularConnectivity.h | 4 ++-- vtkm/cont/testing/UnitTestDataSet.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h index a45d6969b..33f6822cf 100644 --- a/vtkm/cont/DataSet.h +++ b/vtkm/cont/DataSet.h @@ -39,7 +39,7 @@ public: vtkm::Id x_idx, y_idx, z_idx; ExplicitConnectivity conn; - RegularConnectivity3D reg; + RegularConnectivity reg; //TODO: Logical structure: vtkm::Extents? Use EAVL logicalStructure? //traditional data-model diff --git a/vtkm/cont/RegularConnectivity.h b/vtkm/cont/RegularConnectivity.h index ece30a58a..7a6c8a820 100644 --- a/vtkm/cont/RegularConnectivity.h +++ b/vtkm/cont/RegularConnectivity.h @@ -39,9 +39,9 @@ public: void GetIndices(vtkm::Id index, vtkm::Vec &ids) { int i,j,k; - CalculateLogicalCellIndices3D(index, i,j,k); + CalculateLogicalCellIndices(index, i,j,k); ///\todo: assert ItemTupleLength >= 8, or return early? - ids[0] = CalculateNodeIndex3D(i, j, k); + ids[0] = CalculateNodeIndex(i, j, k); if (ItemTupleLength <= 1) return; ids[1] = ids[0] + 1; if (ItemTupleLength <= 2) return; diff --git a/vtkm/cont/testing/UnitTestDataSet.cxx b/vtkm/cont/testing/UnitTestDataSet.cxx index 9f2ad03a4..b5aac630d 100644 --- a/vtkm/cont/testing/UnitTestDataSet.cxx +++ b/vtkm/cont/testing/UnitTestDataSet.cxx @@ -223,7 +223,7 @@ void TestDataSet_Regular() //Set regular structure - ds.reg.SetNodeDimension3D(3,2,3); + ds.reg.SetNodeDimension(3,2,3); //Run a worklet to populate a cell centered field. vtkm::Float32 cellVals[4] = {-1.1, -1.2, -1.3, -1.4};