mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
8b133288ce
There was an error that caused deprecation warnings in VTK-m to be suppressed, which meant that many uses of deprecated features went unnoticed. This fixes those deprecation warnings. The majority of the warnings were caused by the use of the deprecated `Cast`, `CopyTo`, and `ResetTypes` methods of `UnknownArrayHandle` (or `VariantArrayHandle`). Both `Cast` and `CopyTo` have been subsumed by `AsArrayHandle` (to make the functionality more clear). `ResetTypes` now requires a second template argument to define the storage types to try. Also fixed some issues with `SerializableField` being deprecated. This class is no longer necessary because `Field` can now be directly serialized.
76 lines
3.0 KiB
C++
76 lines
3.0 KiB
C++
//============================================================================
|
|
// 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 <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
#include <vtkm/filter/Triangulate.h>
|
|
|
|
using vtkm::cont::testing::MakeTestDataSet;
|
|
|
|
namespace
|
|
{
|
|
|
|
class TestingTriangulate
|
|
{
|
|
public:
|
|
void TestStructured() const
|
|
{
|
|
std::cout << "Testing triangulate structured" << std::endl;
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make2DUniformDataSet1();
|
|
vtkm::filter::Triangulate triangulate;
|
|
triangulate.SetFieldsToPass({ "pointvar", "cellvar" });
|
|
vtkm::cont::DataSet output = triangulate.Execute(dataset);
|
|
VTKM_TEST_ASSERT(test_equal(output.GetNumberOfCells(), 32), "Wrong result for Triangulate");
|
|
VTKM_TEST_ASSERT(test_equal(output.GetField("pointvar").GetNumberOfValues(), 25),
|
|
"Wrong number of points for Triangulate");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> outData =
|
|
output.GetField("cellvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<vtkm::Float32>>();
|
|
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(2) == 1.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(3) == 1.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(30) == 15.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(31) == 15.f, "Wrong cell field data");
|
|
}
|
|
|
|
void TestExplicit() const
|
|
{
|
|
std::cout << "Testing triangulate explicit" << std::endl;
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make2DExplicitDataSet0();
|
|
vtkm::filter::Triangulate triangulate;
|
|
triangulate.SetFieldsToPass({ "pointvar", "cellvar" });
|
|
vtkm::cont::DataSet output = triangulate.Execute(dataset);
|
|
VTKM_TEST_ASSERT(test_equal(output.GetNumberOfCells(), 14), "Wrong result for Triangulate");
|
|
VTKM_TEST_ASSERT(test_equal(output.GetField("pointvar").GetNumberOfValues(), 16),
|
|
"Wrong number of points for Triangulate");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> outData =
|
|
output.GetField("cellvar").GetData().AsArrayHandle<vtkm::cont::ArrayHandle<vtkm::Float32>>();
|
|
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(1) == 1.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(2) == 1.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(5) == 3.f, "Wrong cell field data");
|
|
VTKM_TEST_ASSERT(outData.ReadPortal().Get(6) == 3.f, "Wrong cell field data");
|
|
}
|
|
|
|
void operator()() const
|
|
{
|
|
this->TestStructured();
|
|
this->TestExplicit();
|
|
}
|
|
};
|
|
}
|
|
|
|
int UnitTestTriangulateFilter(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestingTriangulate(), argc, argv);
|
|
}
|