d1a4aecc59
We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
244 lines
8.7 KiB
C++
244 lines
8.7 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/worklet/ExtractPoints.h>
|
|
|
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
using vtkm::cont::testing::MakeTestDataSet;
|
|
|
|
class TestingExtractPoints
|
|
{
|
|
public:
|
|
void TestUniformById() const
|
|
{
|
|
std::cout << "Testing extract points structured by id:" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DUniformDataSet1();
|
|
|
|
// Points to extract
|
|
vtkm::cont::ArrayHandle<vtkm::Id> pointIds =
|
|
vtkm::cont::make_ArrayHandle<vtkm::Id>({ 0, 1, 2, 3, 4, 5, 10, 15, 20, 25, 50, 75, 100 });
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet = extractPoints.Run(dataset.GetCellSet(), pointIds);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), pointIds.GetNumberOfValues()),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestUniformByBox0() const
|
|
{
|
|
std::cout << "Testing extract points with implicit function (box):" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DUniformDataSet1();
|
|
|
|
// Implicit function
|
|
vtkm::Vec3f minPoint(1.f, 1.f, 1.f);
|
|
vtkm::Vec3f maxPoint(3.f, 3.f, 3.f);
|
|
bool extractInside = true;
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet =
|
|
extractPoints.Run(dataset.GetCellSet(),
|
|
dataset.GetCoordinateSystem("coords"),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Box>(minPoint, maxPoint),
|
|
extractInside);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), 27),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestUniformByBox1() const
|
|
{
|
|
std::cout << "Testing extract points with implicit function (box):" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DUniformDataSet1();
|
|
|
|
// Implicit function
|
|
vtkm::Vec3f minPoint(1.f, 1.f, 1.f);
|
|
vtkm::Vec3f maxPoint(3.f, 3.f, 3.f);
|
|
bool extractInside = false;
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet =
|
|
extractPoints.Run(dataset.GetCellSet(),
|
|
dataset.GetCoordinateSystem("coords"),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Box>(minPoint, maxPoint),
|
|
extractInside);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), 98),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestUniformBySphere() const
|
|
{
|
|
std::cout << "Testing extract points with implicit function (sphere):" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DUniformDataSet1();
|
|
|
|
// Implicit function
|
|
vtkm::Vec3f center(2.f, 2.f, 2.f);
|
|
vtkm::FloatDefault radius(1.8f);
|
|
bool extractInside = true;
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet =
|
|
extractPoints.Run(dataset.GetCellSet(),
|
|
dataset.GetCoordinateSystem("coords"),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Sphere>(center, radius),
|
|
extractInside);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), 27),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestExplicitByBox0() const
|
|
{
|
|
std::cout << "Testing extract points with implicit function (box) on explicit:" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DExplicitDataSet5();
|
|
|
|
// Implicit function
|
|
vtkm::Vec3f minPoint(0.f, 0.f, 0.f);
|
|
vtkm::Vec3f maxPoint(1.f, 1.f, 1.f);
|
|
bool extractInside = true;
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet =
|
|
extractPoints.Run(dataset.GetCellSet(),
|
|
dataset.GetCoordinateSystem("coordinates"),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Box>(minPoint, maxPoint),
|
|
extractInside);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), 8),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestExplicitByBox1() const
|
|
{
|
|
std::cout << "Testing extract points with implicit function (box) on explicit:" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DExplicitDataSet5();
|
|
|
|
// Implicit function
|
|
vtkm::Vec3f minPoint(0.f, 0.f, 0.f);
|
|
vtkm::Vec3f maxPoint(1.f, 1.f, 1.f);
|
|
bool extractInside = false;
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet =
|
|
extractPoints.Run(dataset.GetCellSet(),
|
|
dataset.GetCoordinateSystem("coordinates"),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Box>(minPoint, maxPoint),
|
|
extractInside);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), 3),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void TestExplicitById() const
|
|
{
|
|
std::cout << "Testing extract points explicit by id:" << std::endl;
|
|
|
|
using OutCellSetType = vtkm::cont::CellSetSingleType<>;
|
|
|
|
// Input data set created
|
|
vtkm::cont::DataSet dataset = MakeTestDataSet().Make3DExplicitDataSet5();
|
|
|
|
// Points to extract
|
|
vtkm::cont::ArrayHandle<vtkm::Id> pointIds =
|
|
vtkm::cont::make_ArrayHandle<vtkm::Id>({ 0, 4, 5, 7, 9, 10 });
|
|
|
|
// Output dataset contains input coordinate system and point data
|
|
vtkm::cont::DataSet outDataSet;
|
|
outDataSet.AddCoordinateSystem(dataset.GetCoordinateSystem(0));
|
|
|
|
// Output data set with cell set containing extracted points
|
|
vtkm::worklet::ExtractPoints extractPoints;
|
|
OutCellSetType outCellSet = extractPoints.Run(dataset.GetCellSet(), pointIds);
|
|
outDataSet.SetCellSet(outCellSet);
|
|
|
|
VTKM_TEST_ASSERT(test_equal(outCellSet.GetNumberOfCells(), pointIds.GetNumberOfValues()),
|
|
"Wrong result for ExtractPoints");
|
|
}
|
|
|
|
void operator()() const
|
|
{
|
|
this->TestUniformById();
|
|
this->TestUniformByBox0();
|
|
this->TestUniformByBox1();
|
|
this->TestUniformBySphere();
|
|
this->TestExplicitById();
|
|
this->TestExplicitByBox0();
|
|
this->TestExplicitByBox1();
|
|
}
|
|
};
|
|
|
|
int UnitTestExtractPoints(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestingExtractPoints(), argc, argv);
|
|
}
|