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.
171 lines
6.6 KiB
C++
171 lines
6.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/filter/Gradient.h>
|
|
|
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
void TestCellGradientUniform3D()
|
|
{
|
|
std::cout << "Testing Gradient Filter with cell output on 3D structured data" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
vtkm::filter::Gradient gradient;
|
|
gradient.SetOutputFieldName("Gradient");
|
|
|
|
gradient.SetComputeVorticity(true); //this won't work as we have a scalar field
|
|
gradient.SetComputeQCriterion(true); //this won't work as we have a scalar field
|
|
|
|
gradient.SetActiveField("pointvar");
|
|
|
|
vtkm::cont::DataSet result;
|
|
|
|
// We provocate this exception
|
|
try
|
|
{
|
|
result = gradient.Execute(dataSet);
|
|
VTKM_TEST_FAIL("Gradient attempted to compute Vorticity or QCriterion with scalars");
|
|
}
|
|
catch (vtkm::cont::ErrorFilterExecution&)
|
|
{
|
|
// We should exit in this catch
|
|
}
|
|
}
|
|
|
|
void TestCellGradientUniform3DWithVectorField()
|
|
{
|
|
std::cout << "Testing Gradient Filter with vector cell output on 3D structured data" << std::endl;
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
//Verify that we can compute the gradient of a 3 component vector
|
|
const int nVerts = 18;
|
|
vtkm::Float64 vars[nVerts] = { 10.1, 20.1, 30.1, 40.1, 50.2, 60.2, 70.2, 80.2, 90.3,
|
|
100.3, 110.3, 120.3, 130.4, 140.4, 150.4, 160.4, 170.5, 180.5 };
|
|
std::vector<vtkm::Vec3f_64> vec(nVerts);
|
|
for (std::size_t i = 0; i < vec.size(); ++i)
|
|
{
|
|
vec[i] = vtkm::make_Vec(vars[i], vars[i], vars[i]);
|
|
}
|
|
vtkm::cont::ArrayHandle<vtkm::Vec3f_64> input =
|
|
vtkm::cont::make_ArrayHandle(vec, vtkm::CopyFlag::On);
|
|
dataSet.AddPointField("vec_pointvar", input);
|
|
|
|
//we need to add Vec3 array to the dataset
|
|
vtkm::filter::Gradient gradient;
|
|
gradient.SetOutputFieldName("vec_gradient");
|
|
gradient.SetComputeVorticity(true);
|
|
gradient.SetComputeQCriterion(true);
|
|
gradient.SetActiveField("vec_pointvar");
|
|
|
|
vtkm::cont::DataSet result = gradient.Execute(dataSet);
|
|
|
|
VTKM_TEST_ASSERT(result.HasCellField("vec_gradient"), "Result field missing.");
|
|
|
|
//verify that the vorticity and qcriterion fields DO exist
|
|
VTKM_TEST_ASSERT(result.HasField("Vorticity") == true, "vec gradients should generate vorticity");
|
|
VTKM_TEST_ASSERT(result.HasField("QCriterion") == true,
|
|
"vec gradients should generate qcriterion");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Vec3f_64, 3>> resultArrayHandle;
|
|
result.GetCellField("vec_gradient").GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> expected[4] = {
|
|
{ { 10.025, 10.025, 10.025 }, { 30.075, 30.075, 30.075 }, { 60.125, 60.125, 60.125 } },
|
|
{ { 10.025, 10.025, 10.025 }, { 30.075, 30.075, 30.075 }, { 60.125, 60.125, 60.125 } },
|
|
{ { 10.025, 10.025, 10.025 }, { 30.075, 30.075, 30.075 }, { 60.175, 60.175, 60.175 } },
|
|
{ { 10.025, 10.025, 10.025 }, { 30.075, 30.075, 30.075 }, { 60.175, 60.175, 60.175 } }
|
|
};
|
|
for (int i = 0; i < 4; ++i)
|
|
{
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> e = expected[i];
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> r = resultArrayHandle.ReadPortal().Get(i);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(e[0], r[0]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
VTKM_TEST_ASSERT(test_equal(e[1], r[1]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
VTKM_TEST_ASSERT(test_equal(e[2], r[2]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
}
|
|
}
|
|
|
|
|
|
void TestPointGradientUniform3DWithVectorField()
|
|
{
|
|
std::cout << "Testing Gradient Filter with vector point output on 3D structured data"
|
|
<< std::endl;
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
|
|
|
|
//Verify that we can compute the gradient of a 3 component vector
|
|
const int nVerts = 18;
|
|
vtkm::Float64 vars[nVerts] = { 10.1, 20.1, 30.1, 40.1, 50.2, 60.2, 70.2, 80.2, 90.3,
|
|
100.3, 110.3, 120.3, 130.4, 140.4, 150.4, 160.4, 170.5, 180.5 };
|
|
std::vector<vtkm::Vec3f_64> vec(nVerts);
|
|
for (std::size_t i = 0; i < vec.size(); ++i)
|
|
{
|
|
vec[i] = vtkm::make_Vec(vars[i], vars[i], vars[i]);
|
|
}
|
|
vtkm::cont::ArrayHandle<vtkm::Vec3f_64> input =
|
|
vtkm::cont::make_ArrayHandle(vec, vtkm::CopyFlag::On);
|
|
dataSet.AddPointField("vec_pointvar", input);
|
|
|
|
//we need to add Vec3 array to the dataset
|
|
vtkm::filter::Gradient gradient;
|
|
gradient.SetComputePointGradient(true);
|
|
gradient.SetOutputFieldName("vec_gradient");
|
|
gradient.SetActiveField("vec_pointvar");
|
|
vtkm::cont::DataSet result = gradient.Execute(dataSet);
|
|
|
|
VTKM_TEST_ASSERT(result.HasPointField("vec_gradient"), "Result field missing.");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Vec3f_64, 3>> resultArrayHandle;
|
|
result.GetPointField("vec_gradient").GetData().AsArrayHandle(resultArrayHandle);
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> expected[4] = {
|
|
{ { 10.0, 10.0, 10.0 }, { 30.0, 30.0, 30.0 }, { 60.1, 60.1, 60.1 } },
|
|
{ { 10.0, 10.0, 10.0 }, { 30.1, 30.1, 30.1 }, { 60.1, 60.1, 60.1 } },
|
|
{ { 10.0, 10.0, 10.0 }, { 30.1, 30.1, 30.1 }, { 60.2, 60.2, 60.2 } },
|
|
{ { 10.1, 10.1, 10.1 }, { 30.0, 30.0, 30.0 }, { 60.2, 60.2, 60.2 } }
|
|
};
|
|
for (int i = 0; i < 4; ++i)
|
|
{
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> e = expected[i];
|
|
vtkm::Vec<vtkm::Vec3f_64, 3> r = resultArrayHandle.ReadPortal().Get(i);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(e[0], r[0]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
VTKM_TEST_ASSERT(test_equal(e[1], r[1]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
VTKM_TEST_ASSERT(test_equal(e[2], r[2]),
|
|
"Wrong result for vec field CellGradient filter on 3D uniform data");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void TestGradient()
|
|
{
|
|
TestCellGradientUniform3D();
|
|
TestCellGradientUniform3DWithVectorField();
|
|
TestPointGradientUniform3DWithVectorField();
|
|
}
|
|
}
|
|
|
|
int UnitTestGradientUniform(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestGradient, argc, argv);
|
|
}
|