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.
129 lines
4.9 KiB
C++
129 lines
4.9 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/PointAverage.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
void TestPointAverageUniform3D()
|
|
{
|
|
std::cout << "Testing PointAverage Filter on 3D structured data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
vtkm::filter::PointAverage pointAverage;
|
|
pointAverage.SetOutputFieldName("avgvals");
|
|
pointAverage.SetActiveField("cellvar");
|
|
auto result = pointAverage.Execute(dataSet);
|
|
|
|
VTKM_TEST_ASSERT(result.HasPointField("avgvals"), "Field missing.");
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
result.GetPointField("avgvals").GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Float32 expected[18] = { 100.1f, 100.15f, 100.2f, 100.1f, 100.15f, 100.2f,
|
|
100.2f, 100.25f, 100.3f, 100.2f, 100.25f, 100.3f,
|
|
100.3f, 100.35f, 100.4f, 100.3f, 100.35f, 100.4f };
|
|
for (vtkm::Id i = 0; i < 18; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for PointAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
void TestPointAverageRegular3D()
|
|
{
|
|
std::cout << "Testing PointAverage Filter on 2D structured data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DRectilinearDataSet0();
|
|
|
|
vtkm::filter::PointAverage pointAverage;
|
|
pointAverage.SetActiveField("cellvar");
|
|
auto result = pointAverage.Execute(dataSet);
|
|
|
|
// If no name is given, should have the same name as the input.
|
|
VTKM_TEST_ASSERT(result.HasPointField("cellvar"), "Field missing.");
|
|
vtkm::cont::Field Result = result.GetPointField("cellvar");
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
Result.GetData().AsArrayHandle(resultArrayHandle);
|
|
|
|
vtkm::Float32 expected[18] = { 0.f, 0.5f, 1.f, 0.f, 0.5f, 1.f, 1.f, 1.5f, 2.f,
|
|
1.f, 1.5f, 2.f, 2.f, 2.5f, 3.f, 2.f, 2.5f, 3.f };
|
|
for (vtkm::Id i = 0; i < 18; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for PointAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
void TestPointAverageExplicit1()
|
|
{
|
|
std::cout << "Testing PointAverage Filter on Explicit data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet1();
|
|
|
|
vtkm::filter::PointAverage pointAverage;
|
|
pointAverage.SetActiveField("cellvar");
|
|
auto result = pointAverage.Execute(dataSet);
|
|
|
|
// If no name is given, should have the same name as the input.
|
|
VTKM_TEST_ASSERT(result.HasPointField("cellvar"), "Field missing.");
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
result.GetPointField("cellvar").GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Float32 expected[5] = { 100.1f, 100.15f, 100.15f, 100.2f, 100.2f };
|
|
for (int i = 0; i < 5; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for PointAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
void TestPointAverageExplicit2()
|
|
{
|
|
std::cout << "Testing PointAverage Filter on Explicit data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet5();
|
|
|
|
vtkm::filter::PointAverage pointAverage;
|
|
pointAverage.SetActiveField("cellvar");
|
|
auto result = pointAverage.Execute(dataSet);
|
|
|
|
// If no name is given, should have the same name as the input.
|
|
VTKM_TEST_ASSERT(result.HasPointField("cellvar"), "Field missing.");
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
result.GetPointField("cellvar").GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Float32 expected[11] = { 100.1f, 105.05f, 105.05f, 100.1f, 115.3f, 115.2f,
|
|
115.2f, 115.3f, 115.1f, 130.5f, 125.35f };
|
|
for (int i = 0; i < 11; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for PointAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
void TestPointAverage()
|
|
{
|
|
TestPointAverageUniform3D();
|
|
TestPointAverageRegular3D();
|
|
TestPointAverageExplicit1();
|
|
TestPointAverageExplicit2();
|
|
}
|
|
}
|
|
|
|
int UnitTestPointAverageFilter(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestPointAverage, argc, argv);
|
|
}
|