diff --git a/examples/clipping/Clipping.cxx b/examples/clipping/Clipping.cxx index 678c63a9f..7a47bf82f 100644 --- a/examples/clipping/Clipping.cxx +++ b/examples/clipping/Clipping.cxx @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) timer.Reset(); vtkm::cont::DynamicArrayHandle coords = - clip.ProcessField(input.GetCoordinateSystem(0).GetData()); + clip.ProcessField(input.GetCoordinateSystem(0)); vtkm::Float64 processCoordinatesTime = timer.GetElapsedTime(); output.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", coords)); diff --git a/examples/streamline/StreamLineUniformGrid.cxx b/examples/streamline/StreamLineUniformGrid.cxx index 02ac53721..7dfd80d8a 100755 --- a/examples/streamline/StreamLineUniformGrid.cxx +++ b/examples/streamline/StreamLineUniformGrid.cxx @@ -148,7 +148,7 @@ void displayCall() vtkm::cont::CellSetExplicit<> cellSet; outDataSet.GetCellSet(0).CopyTo(cellSet); const vtkm::cont::DynamicArrayHandleCoordinateSystem &coordArray = - outDataSet.GetCoordinateSystem(0).GetData(); + outDataSet.GetCoordinateSystem(0); vtkm::Id numberOfCells = cellSet.GetNumberOfCells(); vtkm::Id numberOfPoints = coordArray.GetNumberOfValues(); diff --git a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx index cc1c25527..5b2371cab 100644 --- a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx @@ -206,7 +206,7 @@ void displayCall() // Get the coordinate system and coordinate data const vtkm::cont::DynamicArrayHandleCoordinateSystem coordArray = - outDataSet.GetCoordinateSystem(0).GetData(); + outDataSet.GetCoordinateSystem(0); // Need the actual vertex points from a static cast of the dynamic array but can't get it right // So use cast and call on a functor that stores that dynamic array into static array we created diff --git a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx index 8abd8e28c..0d116a52f 100644 --- a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx @@ -171,7 +171,7 @@ void displayCall() vtkm::cont::CellSetSingleType<> cellSet; tetDataSet.GetCellSet(0).CopyTo(cellSet); const vtkm::cont::DynamicArrayHandleCoordinateSystem &coordArray = - tetDataSet.GetCoordinateSystem(0).GetData(); + tetDataSet.GetCoordinateSystem(0); // Need the actual vertex points from a static cast of the dynamic array but can't get it right // So use cast and call on a functor that stores that dynamic array into static array we created diff --git a/examples/tetrahedra/TriangulateExplicitGrid.cxx b/examples/tetrahedra/TriangulateExplicitGrid.cxx index c70a4c7dd..286d76b59 100644 --- a/examples/tetrahedra/TriangulateExplicitGrid.cxx +++ b/examples/tetrahedra/TriangulateExplicitGrid.cxx @@ -178,7 +178,7 @@ void displayCall() // Get the coordinate system and coordinate data const vtkm::cont::DynamicArrayHandleCoordinateSystem coordArray = - outDataSet.GetCoordinateSystem(0).GetData(); + outDataSet.GetCoordinateSystem(0); // Need the actual vertex points from a static cast of the dynamic array but can't get it right // So use cast and call on a functor that stores that dynamic array into static array we created diff --git a/examples/tetrahedra/TriangulateUniformGrid.cxx b/examples/tetrahedra/TriangulateUniformGrid.cxx index 2f0a1e511..c2cac7b6e 100644 --- a/examples/tetrahedra/TriangulateUniformGrid.cxx +++ b/examples/tetrahedra/TriangulateUniformGrid.cxx @@ -133,7 +133,7 @@ void displayCall() vtkm::cont::CellSetSingleType<> cellSet; tetDataSet.GetCellSet(0).CopyTo(cellSet); const vtkm::cont::DynamicArrayHandleCoordinateSystem &coordArray = - tetDataSet.GetCoordinateSystem(0).GetData(); + tetDataSet.GetCoordinateSystem(0); // Need the actual vertex points from a static cast of the dynamic array but can't get it right // So use cast and call on a functor that stores that dynamic array into static array we created diff --git a/vtkm/cont/testing/TestingDataSetSingleType.h b/vtkm/cont/testing/TestingDataSetSingleType.h index 96051106a..0ce020c2e 100644 --- a/vtkm/cont/testing/TestingDataSetSingleType.h +++ b/vtkm/cont/testing/TestingDataSetSingleType.h @@ -146,7 +146,7 @@ private: vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology< vtkm::worklet::CellAverage,DeviceAdapterTag> dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), cellset, result); diff --git a/vtkm/cont/testing/UnitTestDataSetPermutation.cxx b/vtkm/cont/testing/UnitTestDataSetPermutation.cxx index 42bef6af1..d35d4f350 100644 --- a/vtkm/cont/testing/UnitTestDataSetPermutation.cxx +++ b/vtkm/cont/testing/UnitTestDataSetPermutation.cxx @@ -125,7 +125,7 @@ void TestDataSet_Explicit() //run a basic for-each topology algorithm on this vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), subset, result); @@ -173,7 +173,7 @@ void TestDataSet_Structured2D() //run a basic for-each topology algorithm on this vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), subset, result); @@ -218,7 +218,7 @@ void TestDataSet_Structured3D() //run a basic for-each topology algorithm on this vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), subset, result); diff --git a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx index 335c93134..a4acfb236 100644 --- a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx +++ b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx @@ -158,24 +158,6 @@ ThreeDimRectilinearTest() vtkm::cont::DataSet dataSet = testDataSet.Make3DRectilinearDataSet0(); - /* - dataSet.PrintSummary(std::cout); - vtkm::cont::CoordinateSystem cs = dataSet.GetCoordinateSystem(); - vtkm::cont::DynamicArrayHandleCoordinateSystem dcs = cs.GetData(); - vtkm::cont::ArrayHandleCartesianProduct< - vtkm::cont::ArrayHandle, - vtkm::cont::ArrayHandle, - vtkm::cont::ArrayHandle > coords; - dcs.CastToArrayHandle(coords); - vtkm::Id n = dcs.GetNumberOfValues(); - vtkm::Vec pt(0,0,0); - for (int i = 0; i < n; i++) - { - pt = coords.GetPortalConstControl().Get(i); - std::cout< cellSet; dataSet.GetCellSet(0).CopyTo(cellSet); diff --git a/vtkm/rendering/raytracing/RayTracer.h b/vtkm/rendering/raytracing/RayTracer.h index c74d423e1..8a87106c5 100644 --- a/vtkm/rendering/raytracing/RayTracer.h +++ b/vtkm/rendering/raytracing/RayTracer.h @@ -259,7 +259,7 @@ public: rays.U, rays.V, rays.Scalar, - scalarField->GetData()); + *scalarField); } else { @@ -268,7 +268,7 @@ public: vtkm::Float32(scalarRange.Max)) ) .Invoke(rays.HitIdx, rays.Scalar, - scalarField->GetData()); + *scalarField); } } // Run diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h index 3fb7cebb4..cf8bed636 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.h +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h @@ -1014,7 +1014,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Rays.MinDistance, Rays.MaxDistance, camera.FrameBuffer, - ScalarField->GetData()); + *ScalarField); } else { @@ -1029,7 +1029,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Rays.MinDistance, Rays.MaxDistance, camera.FrameBuffer, - ScalarField->GetData()); + *ScalarField); } } else @@ -1050,7 +1050,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Rays.MinDistance, Rays.MaxDistance, camera.FrameBuffer, - ScalarField->GetData()); + *ScalarField); } else { @@ -1065,7 +1065,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Rays.MinDistance, Rays.MaxDistance, camera.FrameBuffer, - ScalarField->GetData()); + *ScalarField); } } diff --git a/vtkm/worklet/Threshold.h b/vtkm/worklet/Threshold.h index 6d9f6d67e..75bbaeb59 100644 --- a/vtkm/worklet/Threshold.h +++ b/vtkm/worklet/Threshold.h @@ -119,7 +119,7 @@ public: ThresholdWorklet worklet(predicate); DispatcherMapTopology dispatcher(worklet); - dispatcher.Invoke(cellSet, field.GetData(), passFlags); + dispatcher.Invoke(cellSet, field, passFlags); break; } @@ -129,7 +129,7 @@ public: ThresholdWorklet worklet(predicate); DispatcherMapTopology dispatcher(worklet); - dispatcher.Invoke(cellSet, field.GetData(), passFlags); + dispatcher.Invoke(cellSet, field, passFlags); break; } diff --git a/vtkm/worklet/testing/UnitTestCellAverage.cxx b/vtkm/worklet/testing/UnitTestCellAverage.cxx index c15ba03f5..d7d370477 100644 --- a/vtkm/worklet/testing/UnitTestCellAverage.cxx +++ b/vtkm/worklet/testing/UnitTestCellAverage.cxx @@ -40,7 +40,7 @@ void TestCellAverageUniform3D() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), dataSet.GetCellSet(), result); @@ -63,7 +63,7 @@ void TestCellAverageUniform2D() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), dataSet.GetCellSet(), result); @@ -86,7 +86,7 @@ void TestCellAverageExplicit() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), dataSet.GetCellSet(), result); diff --git a/vtkm/worklet/testing/UnitTestClipping.cxx b/vtkm/worklet/testing/UnitTestClipping.cxx index 755b81240..476c5cf94 100644 --- a/vtkm/worklet/testing/UnitTestClipping.cxx +++ b/vtkm/worklet/testing/UnitTestClipping.cxx @@ -120,7 +120,9 @@ void TestClippingExplicit() vtkm::worklet::Clip clip; vtkm::cont::CellSetExplicit<> outputCellSet = - clip.Run(ds.GetCellSet(0), ds.GetField("scalars").GetData(), clipValue); + clip.Run(ds.GetCellSet(0), + ds.GetField("scalars").GetData(), + clipValue); vtkm::cont::DynamicArrayHandle coords = @@ -169,7 +171,9 @@ void TestClippingStrucutred() vtkm::worklet::Clip clip; vtkm::cont::CellSetExplicit<> outputCellSet = - clip.Run(ds.GetCellSet(0), ds.GetField("scalars").GetData(), clipValue); + clip.Run(ds.GetCellSet(0), + ds.GetField("scalars").GetData(), + clipValue); vtkm::cont::DynamicArrayHandle coords = diff --git a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx index 77b98daa3..4a036abab 100644 --- a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx +++ b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx @@ -308,7 +308,7 @@ void TestMarchingCubesExplicit() marchingCubes.Run(contourValue, cellSet, - dataSet.GetCoordinateSystem().GetData(), + dataSet.GetCoordinateSystem(), contourArray, vertices, normals, diff --git a/vtkm/worklet/testing/UnitTestPointElevation.cxx b/vtkm/worklet/testing/UnitTestPointElevation.cxx index 1e46dbd82..f6e61bcf0 100644 --- a/vtkm/worklet/testing/UnitTestPointElevation.cxx +++ b/vtkm/worklet/testing/UnitTestPointElevation.cxx @@ -90,7 +90,7 @@ void TestPointElevation() vtkm::worklet::DispatcherMapField dispatcher(pointElevationWorklet); - dispatcher.Invoke(dataSet.GetCoordinateSystem().GetData(), + dispatcher.Invoke(dataSet.GetCoordinateSystem(), result); vtkm::cont::ArrayHandle > coordinates; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx index 3ad87e093..01e9d34e3 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx @@ -154,8 +154,8 @@ TestMaxPointOrCell() vtkm::worklet::DispatcherMapTopology< ::test_explicit::MaxPointOrCellValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("cellvar").GetData(), - dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("cellvar"), + dataSet.GetField("pointvar"), dataSet.GetCellSet(0), result); @@ -177,7 +177,7 @@ TestAvgPointToCell() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology< ::test_explicit::AveragePointToCellValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), dataSet.GetCellSet(), result); @@ -200,7 +200,7 @@ TestAvgCellToPoint() vtkm::worklet::DispatcherMapTopology< ::test_explicit::AverageCellToPointValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("cellvar").GetData(), + dispatcher.Invoke(dataSet.GetField("cellvar"), dataSet.GetCellSet(), result); diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx index e6c1fe45d..e0c750eba 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx @@ -181,8 +181,8 @@ TestMaxPointOrCell() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology< ::test_uniform::MaxPointOrCellValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("cellvar").GetData(), - dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("cellvar"), + dataSet.GetField("pointvar"), // We know that the cell set is a structured 2D grid and // The worklet does not work with general types because // of the way we get cell indices. We need to make that @@ -209,7 +209,7 @@ TestAvgPointToCell() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology< ::test_uniform::AveragePointToCellValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("pointvar").GetData(), + dispatcher.Invoke(dataSet.GetField("pointvar"), // We know that the cell set is a structured 2D grid and // The worklet does not work with general types because // of the way we get cell indices. We need to make that @@ -236,7 +236,7 @@ TestAvgCellToPoint() vtkm::cont::ArrayHandle result; vtkm::worklet::DispatcherMapTopology< ::test_uniform::AverageCellToPointValue > dispatcher; - dispatcher.Invoke(dataSet.GetField("cellvar").GetData(), + dispatcher.Invoke(dataSet.GetField("cellvar"), // We know that the cell set is a structured 2D grid and // The worklet does not work with general types because // of the way we get cell indices. We need to make that @@ -265,11 +265,11 @@ TestStructuredUniformPointCoords() vtkm::cont::DataSet dataSet3D = testDataSet.Make3DUniformDataSet0(); dispatcher.Invoke(dataSet3D.GetCellSet(), - dataSet3D.GetCoordinateSystem().GetData()); + dataSet3D.GetCoordinateSystem()); vtkm::cont::DataSet dataSet2D = testDataSet.Make2DUniformDataSet0(); dispatcher.Invoke(dataSet2D.GetCellSet(), - dataSet2D.GetCoordinateSystem().GetData()); + dataSet2D.GetCoordinateSystem()); } } // anonymous namespace