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.
131 lines
4.6 KiB
C++
131 lines
4.6 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/CellAverage.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
void TestCellAverageRegular3D()
|
|
{
|
|
std::cout << "Testing CellAverage Filter on 3D structured data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
vtkm::filter::CellAverage cellAverage;
|
|
cellAverage.SetOutputFieldName("avgvals");
|
|
cellAverage.SetActiveField("pointvar");
|
|
vtkm::cont::DataSet result = cellAverage.Execute(dataSet);
|
|
|
|
VTKM_TEST_ASSERT(result.HasCellField("avgvals") == true, "Result field not present.");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
result.GetCellField("avgvals").GetData().AsArrayHandle(resultArrayHandle);
|
|
{
|
|
vtkm::Float32 expected[4] = { 60.1875f, 70.2125f, 120.3375f, 130.3625f };
|
|
for (vtkm::Id i = 0; i < 4; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
std::cout << "Run again for point coordinates" << std::endl;
|
|
cellAverage.SetOutputFieldName("avgpos");
|
|
cellAverage.SetUseCoordinateSystemAsField(true);
|
|
result = cellAverage.Execute(dataSet);
|
|
|
|
VTKM_TEST_ASSERT(result.HasCellField("avgpos"), "Result field not present.");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Vec3f> resultPointArray;
|
|
vtkm::cont::Field resultPointField = result.GetCellField("avgpos");
|
|
resultPointField.GetData().AsArrayHandle(resultPointArray);
|
|
{
|
|
vtkm::FloatDefault expected[4][3] = {
|
|
{ 0.5f, 0.5f, 0.5f }, { 1.5f, 0.5f, 0.5f }, { 0.5f, 0.5f, 1.5f }, { 1.5f, 0.5f, 1.5f }
|
|
};
|
|
for (vtkm::Id i = 0; i < 4; ++i)
|
|
{
|
|
vtkm::Vec3f expectedVec(expected[i][0], expected[i][1], expected[i][2]);
|
|
vtkm::Vec3f computedVec(resultPointArray.ReadPortal().Get(i));
|
|
VTKM_TEST_ASSERT(test_equal(computedVec, expectedVec),
|
|
"Wrong result for CellAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
}
|
|
|
|
void TestCellAverageRegular2D()
|
|
{
|
|
std::cout << "Testing CellAverage Filter on 2D structured data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make2DUniformDataSet0();
|
|
|
|
vtkm::filter::CellAverage cellAverage;
|
|
cellAverage.SetActiveField("pointvar");
|
|
|
|
vtkm::cont::DataSet result = cellAverage.Execute(dataSet);
|
|
|
|
// If no name is given, should have the same name as the input.
|
|
VTKM_TEST_ASSERT(result.HasPointField("pointvar"), "Field missing.");
|
|
|
|
vtkm::cont::Field resultField = result.GetCellField("pointvar");
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
resultField.GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Float32 expected[2] = { 30.1f, 40.1f };
|
|
for (int i = 0; i < 2; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on 2D regular data");
|
|
}
|
|
}
|
|
|
|
void TestCellAverageExplicit()
|
|
{
|
|
std::cout << "Testing CellAverage Filter on Explicit data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet0();
|
|
|
|
vtkm::filter::CellAverage cellAverage;
|
|
cellAverage.SetActiveField("pointvar");
|
|
|
|
vtkm::cont::DataSet result = cellAverage.Execute(dataSet);
|
|
|
|
// If no name is given, should have the same name as the input.
|
|
VTKM_TEST_ASSERT(result.HasCellField("pointvar"), "Field missing.");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
|
|
vtkm::cont::Field resultField = result.GetCellField("pointvar");
|
|
resultField.GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Float32 expected[2] = { 20.1333f, 35.2f };
|
|
for (int i = 0; i < 2; ++i)
|
|
{
|
|
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.ReadPortal().Get(i), expected[i]),
|
|
"Wrong result for CellAverage worklet on 3D regular data");
|
|
}
|
|
}
|
|
|
|
void TestCellAverage()
|
|
{
|
|
TestCellAverageRegular2D();
|
|
TestCellAverageRegular3D();
|
|
TestCellAverageExplicit();
|
|
}
|
|
}
|
|
|
|
int UnitTestCellAverageFilter(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestCellAverage, argc, argv);
|
|
}
|