From 414effa8e8346429a03e743866736bc9c5c6bb16 Mon Sep 17 00:00:00 2001 From: Li-Ta Lo Date: Sat, 17 Aug 2019 19:26:32 -0600 Subject: [PATCH] remove unused contour unit test --- vtkm/worklet/testing/CMakeLists.txt | 3 +- .../testing/UnitTestMarchingSquares.cxx | 86 ----------------- .../testing/UnitTestMarchingTetrahedra.cxx | 93 ------------------- 3 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 vtkm/worklet/testing/UnitTestMarchingSquares.cxx delete mode 100644 vtkm/worklet/testing/UnitTestMarchingTetrahedra.cxx diff --git a/vtkm/worklet/testing/CMakeLists.txt b/vtkm/worklet/testing/CMakeLists.txt index 7e4c996a5..449594f90 100644 --- a/vtkm/worklet/testing/CMakeLists.txt +++ b/vtkm/worklet/testing/CMakeLists.txt @@ -38,8 +38,7 @@ set(unit_tests # UnitTestMagnitude.cxx UnitTestMarchingCubes.cxx # UnitTestMarchingSquares.cxx - UnitTestMarchingTetrahedra.cxx -# UnitTestMask.cxx + # UnitTestMask.cxx # UnitTestMaskIndices.cxx # UnitTestMaskPoints.cxx # UnitTestMaskSelect.cxx diff --git a/vtkm/worklet/testing/UnitTestMarchingSquares.cxx b/vtkm/worklet/testing/UnitTestMarchingSquares.cxx deleted file mode 100644 index 5e5a485d7..000000000 --- a/vtkm/worklet/testing/UnitTestMarchingSquares.cxx +++ /dev/null @@ -1,86 +0,0 @@ -//============================================================================ -// Copyright (c) Kitware, Inc. -// All rights reserved. -// See LICENSE.txt for details. -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notice for more information. -//============================================================================ - -#include -#include -#include -#include -#include - -class SineWave : public vtkm::worklet::WorkletMapField -{ -public: - using ControlSignature = void(FieldIn coord, FieldOut v); - using ExecutionSignature = void(_1, _2); - using InputDomain = _1; - - VTKM_EXEC - void operator()(const vtkm::Vec coord, vtkm::Float32& v) const - { - v = vtkm::MagnitudeSquared(coord); - } -}; - -vtkm::cont::DataSet MakeSineWaveDataSet(vtkm::Id3 dims) -{ - vtkm::cont::DataSet dataset; - - // create a point coordinate system - const vtkm::Id3 vdims{ dims[0] + 1, dims[1] + 1, dims[2] + 1 }; - vtkm::cont::ArrayHandleUniformPointCoordinates coordinates{ - vdims, - vtkm::Vec(-1.0, -1.0, 0), - vtkm::Vec(2.0f / vdims[0], 2.0f / vdims[1], 0.0) - }; - dataset.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", coordinates)); - - // generate point field from point coordinates. - vtkm::cont::ArrayHandle pointFieldArray; - vtkm::worklet::DispatcherMapField dispatcherMapField(SineWave{}); - dispatcherMapField.Invoke(coordinates, pointFieldArray); - dataset.AddField( - vtkm::cont::Field("nodevar", vtkm::cont::Field::Association::POINTS, pointFieldArray)); - - // add cell set - vtkm::cont::CellSetStructured<2> cellSet("cells"); - cellSet.SetPointDimensions({ vdims[0], vdims[1] }); - dataset.AddCellSet(cellSet); - - return dataset; -} - -void TestMarchingSquares() -{ - vtkm::cont::DataSet input = MakeSineWaveDataSet({ 2, 2, 0 }); - - vtkm::cont::ArrayHandle pointFieldArray; - input.GetField("nodevar").GetData().CopyTo(pointFieldArray); - - vtkm::Float32 isoValue = 0.5; - vtkm::cont::ArrayHandle> verticesArray; - vtkm::cont::ArrayHandle> normalsArray; - vtkm::cont::ArrayHandle scalarsArray; - - vtkm::worklet::MarchingCubes isosurfaceFilter; - isosurfaceFilter.SetMergeDuplicatePoints(false); - - auto result = isosurfaceFilter.Run(&isoValue, - 1, - input.GetCellSet(0), - input.GetCoordinateSystem(), - pointFieldArray, - verticesArray, - normalsArray); -} - -int UnitTestMarchingSquares(int argc, char* argv[]) -{ - return vtkm::cont::testing::Testing::Run(TestMarchingSquares, argc, argv); -} \ No newline at end of file diff --git a/vtkm/worklet/testing/UnitTestMarchingTetrahedra.cxx b/vtkm/worklet/testing/UnitTestMarchingTetrahedra.cxx deleted file mode 100644 index 374ee21ea..000000000 --- a/vtkm/worklet/testing/UnitTestMarchingTetrahedra.cxx +++ /dev/null @@ -1,93 +0,0 @@ -//============================================================================ -// Copyright (c) Kitware, Inc. -// All rights reserved. -// See LICENSE.txt for details. -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notice for more information. -//============================================================================ - -#include -#include -#include -#include -#include -#include - -class Tangle : public vtkm::worklet::WorkletMapField -{ -public: - using ControlSignature = void(FieldIn coord, FieldOut v); - using ExecutionSignature = void(_1, _2); - using InputDomain = _1; - - VTKM_EXEC - void operator()(const vtkm::Vec coord, vtkm::Float32& v) const - { - v = vtkm::MagnitudeSquared(coord); - } -}; - -vtkm::cont::DataSet MakeTangleDataSet(vtkm::Id3 dims) -{ - vtkm::cont::DataSet dataset; - - // create a point coordinate system - const vtkm::Id3 vdims{ dims[0] + 1, dims[1] + 1, dims[2] + 1 }; - vtkm::cont::ArrayHandleUniformPointCoordinates coordinates{ - vdims, - vtkm::Vec(-1.0, -1.0, -1.0), - vtkm::Vec(2.0f / vdims[0], 2.0f / vdims[1], 2.0f / vdims[2]) - }; - dataset.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", coordinates)); - - // generate point field from point coordinates. - vtkm::cont::ArrayHandle pointFieldArray; - vtkm::worklet::DispatcherMapField dispatcherMapField(Tangle{}); - dispatcherMapField.Invoke(coordinates, pointFieldArray); - dataset.AddField( - vtkm::cont::Field("nodevar", vtkm::cont::Field::Association::POINTS, pointFieldArray)); - - // add cell set - vtkm::cont::CellSetStructured<3> cellSet("cells"); - cellSet.SetPointDimensions(vdims); - dataset.AddCellSet(cellSet); - - return dataset; -} - -void TestMarchingTetrahedra() -{ - vtkm::cont::DataSet input = MakeTangleDataSet({ 2, 2, 2 }); - - vtkm::filter::Tetrahedralize tetrahedralize; - vtkm::cont::DataSet tetra = tetrahedralize.Execute(input); - - std::cout << "number of tetras: " << tetra.GetCellSet().GetNumberOfCells() << std::endl; - vtkm::cont::ArrayHandle pointFieldArray; - tetra.GetField("nodevar").GetData().CopyTo(pointFieldArray); - - vtkm::Float32 isoValue = 0.5; - vtkm::cont::ArrayHandle> verticesArray; - vtkm::cont::ArrayHandle> normalsArray; - vtkm::cont::ArrayHandle scalarsArray; - - vtkm::worklet::Contour isosurfaceFilter; - isosurfaceFilter.SetMergeDuplicatePoints(false); - - auto result = isosurfaceFilter.Run(&isoValue, - 1, - tetra.GetCellSet(0), - tetra.GetCoordinateSystem(), - pointFieldArray, - verticesArray, - normalsArray); - - result.PrintSummary(std::cout); -} - -int UnitTestMarchingTetrahedra(int argc, char* argv[]) -{ - return vtkm::cont::testing::Testing::Run(TestMarchingTetrahedra, argc, argv); -} \ No newline at end of file