5db762ee71
The `From` and `To` nomenclature for topology mapping has been confusing for both users and developers, especially at lower levels where the intention of mapping attributes from one element to another is easily conflated with the concept of mapping indices (which maps in the exact opposite direction). These identifiers have been renamed to `VisitTopology` and `IncidentTopology` to clarify the direction of the mapping. The order in which these template parameters are specified for `WorkletMapTopology` have also been reversed, since eventually there may be more than one `IncidentTopology`, and having `IncidentTopology` at the end will allow us to replace it with a variadic template parameter pack in the future. Other implementation details supporting these worklets, include `Fetch` tags, `Connectivity` classes, and methods on the various `CellSet` classes (such as `PrepareForInput` have also reversed their template arguments. These will need to be cautiously updated. The convenience implementations of `WorkletMapTopology` have been renamed for clarity as follows: ``` WorkletMapPointToCell --> WorkletVisitCellsWithPoints WorkletMapCellToPoint --> WorkletVisitPointsWithCells ``` The `ControlSignature` tags have been renamed as follows: ``` FieldInTo --> FieldInVisit FieldInFrom --> FieldInMap FromCount --> IncidentElementCount FromIndices --> IncidentElementIndices ```
355 lines
13 KiB
C++
355 lines
13 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/Clip.h>
|
|
|
|
#include <vtkm/cont/CellSet.h>
|
|
#include <vtkm/cont/CellSetExplicit.h>
|
|
#include <vtkm/cont/CellSetStructured.h>
|
|
#include <vtkm/cont/CoordinateSystem.h>
|
|
#include <vtkm/cont/DataSet.h>
|
|
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
|
#include <vtkm/cont/DataSetBuilderUniform.h>
|
|
#include <vtkm/cont/DataSetFieldAdd.h>
|
|
#include <vtkm/cont/Field.h>
|
|
#include <vtkm/cont/ImplicitFunctionHandle.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
|
|
#include <vector>
|
|
|
|
using Coord3D = vtkm::Vec<vtkm::FloatDefault, 3>;
|
|
|
|
const vtkm::Float32 clipValue = 0.5;
|
|
|
|
template <typename T, typename Storage>
|
|
bool TestArrayHandle(const vtkm::cont::ArrayHandle<T, Storage>& ah,
|
|
const T* expected,
|
|
vtkm::Id size)
|
|
{
|
|
if (size != ah.GetNumberOfValues())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
for (vtkm::Id i = 0; i < size; ++i)
|
|
{
|
|
if (ah.GetPortalConstControl().Get(i) != expected[i])
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
vtkm::cont::DataSet MakeTestDatasetExplicit()
|
|
{
|
|
std::vector<Coord3D> coords;
|
|
coords.push_back(Coord3D(0.0f, 0.0f, 0.0f));
|
|
coords.push_back(Coord3D(1.0f, 0.0f, 0.0f));
|
|
coords.push_back(Coord3D(1.0f, 1.0f, 0.0f));
|
|
coords.push_back(Coord3D(0.0f, 1.0f, 0.0f));
|
|
|
|
std::vector<vtkm::Id> connectivity;
|
|
connectivity.push_back(0);
|
|
connectivity.push_back(1);
|
|
connectivity.push_back(3);
|
|
connectivity.push_back(3);
|
|
connectivity.push_back(1);
|
|
connectivity.push_back(2);
|
|
|
|
vtkm::cont::DataSet ds;
|
|
vtkm::cont::DataSetBuilderExplicit builder;
|
|
ds = builder.Create(coords, vtkm::CellShapeTagTriangle(), 3, connectivity, "coords");
|
|
|
|
vtkm::cont::DataSetFieldAdd fieldAdder;
|
|
|
|
std::vector<vtkm::Float32> values;
|
|
values.push_back(1.0);
|
|
values.push_back(2.0);
|
|
values.push_back(1.0);
|
|
values.push_back(0.0);
|
|
fieldAdder.AddPointField(ds, "scalars", values);
|
|
|
|
values.clear();
|
|
values.push_back(100.f);
|
|
values.push_back(-100.f);
|
|
fieldAdder.AddCellField(ds, "cellvar", values);
|
|
|
|
return ds;
|
|
}
|
|
|
|
vtkm::cont::DataSet MakeTestDatasetStructured()
|
|
{
|
|
static constexpr vtkm::Id xdim = 3, ydim = 3;
|
|
static const vtkm::Id2 dim(xdim, ydim);
|
|
static constexpr vtkm::Id numVerts = xdim * ydim;
|
|
|
|
vtkm::Float32 scalars[numVerts];
|
|
for (vtkm::Id i = 0; i < numVerts; ++i)
|
|
{
|
|
scalars[i] = 1.0f;
|
|
}
|
|
scalars[4] = 0.0f;
|
|
|
|
vtkm::cont::DataSet ds;
|
|
vtkm::cont::DataSetBuilderUniform builder;
|
|
ds = builder.Create(dim);
|
|
|
|
vtkm::cont::DataSetFieldAdd fieldAdder;
|
|
fieldAdder.AddPointField(ds, "scalars", scalars, numVerts);
|
|
|
|
std::vector<vtkm::Float32> cellvar = { -100.f, 100.f, 30.f, -30.f };
|
|
fieldAdder.AddCellField(ds, "cellvar", cellvar);
|
|
|
|
return ds;
|
|
}
|
|
|
|
void TestClippingExplicit()
|
|
{
|
|
vtkm::cont::DataSet ds = MakeTestDatasetExplicit();
|
|
vtkm::worklet::Clip clip;
|
|
bool invertClip = false;
|
|
vtkm::cont::CellSetExplicit<> outputCellSet =
|
|
clip.Run(ds.GetCellSet(0),
|
|
ds.GetField("scalars").GetData().ResetTypes(vtkm::TypeListTagFieldScalar()),
|
|
clipValue,
|
|
invertClip);
|
|
|
|
auto coordsIn = ds.GetCoordinateSystem("coords").GetData();
|
|
vtkm::cont::ArrayHandle<Coord3D> coords = clip.ProcessPointField(coordsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalarsIn;
|
|
ds.GetField("scalars").GetData().CopyTo(scalarsIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalars = clip.ProcessPointField(scalarsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvarIn;
|
|
ds.GetField("cellvar").GetData().CopyTo(cellvarIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvar = clip.ProcessCellField(cellvarIn);
|
|
|
|
vtkm::Id connectivitySize = 8;
|
|
vtkm::Id fieldSize = 7;
|
|
vtkm::Id expectedConnectivity[] = { 0, 1, 5, 4, 1, 2, 6, 5 };
|
|
const Coord3D expectedCoords[] = {
|
|
Coord3D(0.00f, 0.00f, 0.0f), Coord3D(1.00f, 0.00f, 0.0f), Coord3D(1.00f, 1.00f, 0.0f),
|
|
Coord3D(0.00f, 1.00f, 0.0f), Coord3D(0.00f, 0.50f, 0.0f), Coord3D(0.25f, 0.75f, 0.0f),
|
|
Coord3D(0.50f, 1.00f, 0.0f),
|
|
};
|
|
const vtkm::Float32 expectedScalars[] = { 1, 2, 1, 0, 0.5, 0.5, 0.5 };
|
|
std::vector<vtkm::Float32> expectedCellvar = { 100.f, -100.f };
|
|
|
|
VTKM_TEST_ASSERT(outputCellSet.GetNumberOfPoints() == fieldSize,
|
|
"Wrong number of points in cell set.");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(outputCellSet.GetConnectivityArray(vtkm::TopologyElementTagCell(),
|
|
vtkm::TopologyElementTagPoint()),
|
|
expectedConnectivity,
|
|
connectivitySize),
|
|
"Got incorrect conectivity");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(coords, expectedCoords, fieldSize), "Got incorrect coordinates");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(scalars, expectedScalars, fieldSize), "Got incorrect scalars");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(cellvar, expectedCellvar.data(), static_cast<vtkm::Id>(expectedCellvar.size())),
|
|
"Got incorrect cellvar");
|
|
}
|
|
|
|
void TestClippingStructured()
|
|
{
|
|
using CoordsValueType = vtkm::cont::ArrayHandleUniformPointCoordinates::ValueType;
|
|
using CoordsOutType = vtkm::cont::ArrayHandle<CoordsValueType>;
|
|
|
|
vtkm::cont::DataSet ds = MakeTestDatasetStructured();
|
|
|
|
bool invertClip = false;
|
|
vtkm::worklet::Clip clip;
|
|
vtkm::cont::CellSetExplicit<> outputCellSet =
|
|
clip.Run(ds.GetCellSet(0),
|
|
ds.GetField("scalars").GetData().ResetTypes(vtkm::TypeListTagFieldScalar()),
|
|
clipValue,
|
|
invertClip);
|
|
|
|
auto coordsIn = ds.GetCoordinateSystem("coords").GetData();
|
|
CoordsOutType coords = clip.ProcessPointField(coordsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalarsIn;
|
|
ds.GetField("scalars").GetData().CopyTo(scalarsIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalars = clip.ProcessPointField(scalarsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvarIn;
|
|
ds.GetField("cellvar").GetData().CopyTo(cellvarIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvar = clip.ProcessCellField(cellvarIn);
|
|
|
|
|
|
vtkm::Id connectivitySize = 28;
|
|
vtkm::Id fieldSize = 13;
|
|
const vtkm::Id expectedConnectivity[] = { 9, 10, 3, 1, 1, 3, 0, 11, 9, 1, 5, 5, 1, 2,
|
|
10, 12, 7, 3, 3, 7, 6, 12, 11, 5, 7, 7, 5, 8 };
|
|
|
|
const Coord3D expectedCoords[] = {
|
|
Coord3D(0.0f, 0.0f, 0.0f), Coord3D(1.0f, 0.0f, 0.0f), Coord3D(2.0f, 0.0f, 0.0f),
|
|
Coord3D(0.0f, 1.0f, 0.0f), Coord3D(1.0f, 1.0f, 0.0f), Coord3D(2.0f, 1.0f, 0.0f),
|
|
Coord3D(0.0f, 2.0f, 0.0f), Coord3D(1.0f, 2.0f, 0.0f), Coord3D(2.0f, 2.0f, 0.0f),
|
|
Coord3D(1.0f, 0.5f, 0.0f), Coord3D(0.5f, 1.0f, 0.0f), Coord3D(1.5f, 1.0f, 0.0f),
|
|
Coord3D(1.0f, 1.5f, 0.0f),
|
|
};
|
|
const vtkm::Float32 expectedScalars[] = { 1, 1, 1, 1, 0, 1, 1, 1, 1, 0.5, 0.5, 0.5, 0.5 };
|
|
std::vector<vtkm::Float32> expectedCellvar = { -100.f, -100.f, 100.f, 100.f,
|
|
30.f, 30.f, -30.f, -30.f };
|
|
|
|
VTKM_TEST_ASSERT(outputCellSet.GetNumberOfPoints() == fieldSize,
|
|
"Wrong number of points in cell set.");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(outputCellSet.GetConnectivityArray(vtkm::TopologyElementTagCell(),
|
|
vtkm::TopologyElementTagPoint()),
|
|
expectedConnectivity,
|
|
connectivitySize),
|
|
"Got incorrect conectivity");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(coords, expectedCoords, fieldSize), "Got incorrect coordinates");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(scalars, expectedScalars, fieldSize), "Got incorrect scalars");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(cellvar, expectedCellvar.data(), static_cast<vtkm::Id>(expectedCellvar.size())),
|
|
"Got incorrect cellvar");
|
|
}
|
|
|
|
void TestClippingWithImplicitFunction()
|
|
{
|
|
vtkm::Vec<vtkm::FloatDefault, 3> center(1, 1, 0);
|
|
vtkm::FloatDefault radius(0.5);
|
|
|
|
vtkm::cont::DataSet ds = MakeTestDatasetStructured();
|
|
|
|
bool invertClip = false;
|
|
vtkm::worklet::Clip clip;
|
|
vtkm::cont::CellSetExplicit<> outputCellSet =
|
|
clip.Run(ds.GetCellSet(0),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Sphere>(center, radius),
|
|
ds.GetCoordinateSystem("coords"),
|
|
invertClip);
|
|
|
|
auto coordsIn = ds.GetCoordinateSystem("coords").GetData();
|
|
vtkm::cont::ArrayHandle<Coord3D> coords = clip.ProcessPointField(coordsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalarsIn;
|
|
ds.GetField("scalars").GetData().CopyTo(scalarsIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalars = clip.ProcessPointField(scalarsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvarIn;
|
|
ds.GetField("cellvar").GetData().CopyTo(cellvarIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvar = clip.ProcessCellField(cellvarIn);
|
|
|
|
vtkm::Id connectivitySize = 28;
|
|
vtkm::Id fieldSize = 13;
|
|
|
|
const vtkm::Id expectedConnectivity[] = { 9, 10, 3, 1, 1, 3, 0, 11, 9, 1, 5, 5, 1, 2,
|
|
10, 12, 7, 3, 3, 7, 6, 12, 11, 5, 7, 7, 5, 8 };
|
|
|
|
const Coord3D expectedCoords[] = {
|
|
Coord3D(0.0f, 0.0f, 0.0f), Coord3D(1.0f, 0.0f, 0.0f), Coord3D(2.0f, 0.0f, 0.0f),
|
|
Coord3D(0.0f, 1.0f, 0.0f), Coord3D(1.0f, 1.0f, 0.0f), Coord3D(2.0f, 1.0f, 0.0f),
|
|
Coord3D(0.0f, 2.0f, 0.0f), Coord3D(1.0f, 2.0f, 0.0f), Coord3D(2.0f, 2.0f, 0.0f),
|
|
Coord3D(1.0f, 0.75f, 0.0f), Coord3D(0.75f, 1.0f, 0.0f), Coord3D(1.25f, 1.0f, 0.0f),
|
|
Coord3D(1.0f, 1.25f, 0.0f),
|
|
};
|
|
const vtkm::Float32 expectedScalars[] = { 1, 1, 1, 1, 0, 1, 1, 1, 1, 0.25, 0.25, 0.25, 0.25 };
|
|
std::vector<vtkm::Float32> expectedCellvar = { -100.f, -100.f, 100.f, 100.f,
|
|
30.f, 30.f, -30.f, -30.f };
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(outputCellSet.GetConnectivityArray(vtkm::TopologyElementTagCell(),
|
|
vtkm::TopologyElementTagPoint()),
|
|
expectedConnectivity,
|
|
connectivitySize),
|
|
"Got incorrect conectivity");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(coords, expectedCoords, fieldSize), "Got incorrect coordinates");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(scalars, expectedScalars, fieldSize), "Got incorrect scalars");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(cellvar, expectedCellvar.data(), static_cast<vtkm::Id>(expectedCellvar.size())),
|
|
"Got incorrect cellvar");
|
|
}
|
|
|
|
void TestClippingWithImplicitFunctionInverted()
|
|
{
|
|
vtkm::Vec<vtkm::FloatDefault, 3> center(1, 1, 0);
|
|
vtkm::FloatDefault radius(0.5);
|
|
|
|
vtkm::cont::DataSet ds = MakeTestDatasetStructured();
|
|
|
|
bool invertClip = true;
|
|
vtkm::worklet::Clip clip;
|
|
vtkm::cont::CellSetExplicit<> outputCellSet =
|
|
clip.Run(ds.GetCellSet(0),
|
|
vtkm::cont::make_ImplicitFunctionHandle<vtkm::Sphere>(center, radius),
|
|
ds.GetCoordinateSystem("coords"),
|
|
invertClip);
|
|
|
|
auto coordsIn = ds.GetCoordinateSystem("coords").GetData();
|
|
vtkm::cont::ArrayHandle<Coord3D> coords = clip.ProcessPointField(coordsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalarsIn;
|
|
ds.GetField("scalars").GetData().CopyTo(scalarsIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> scalars = clip.ProcessPointField(scalarsIn);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvarIn;
|
|
ds.GetField("cellvar").GetData().CopyTo(cellvarIn);
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> cellvar = clip.ProcessCellField(cellvarIn);
|
|
|
|
vtkm::Id connectivitySize = 12;
|
|
vtkm::Id fieldSize = 13;
|
|
vtkm::Id expectedConnectivity[] = { 10, 9, 4, 9, 11, 4, 12, 10, 4, 11, 12, 4 };
|
|
const Coord3D expectedCoords[] = {
|
|
Coord3D(0.0f, 0.0f, 0.0f), Coord3D(1.0f, 0.0f, 0.0f), Coord3D(2.0f, 0.0f, 0.0f),
|
|
Coord3D(0.0f, 1.0f, 0.0f), Coord3D(1.0f, 1.0f, 0.0f), Coord3D(2.0f, 1.0f, 0.0f),
|
|
Coord3D(0.0f, 2.0f, 0.0f), Coord3D(1.0f, 2.0f, 0.0f), Coord3D(2.0f, 2.0f, 0.0f),
|
|
Coord3D(1.0f, 0.75f, 0.0f), Coord3D(0.75f, 1.0f, 0.0f), Coord3D(1.25f, 1.0f, 0.0f),
|
|
Coord3D(1.0f, 1.25f, 0.0f),
|
|
};
|
|
vtkm::Float32 expectedScalars[] = { 1, 1, 1, 1, 0, 1, 1, 1, 1, 0.25, 0.25, 0.25, 0.25 };
|
|
std::vector<vtkm::Float32> expectedCellvar = { -100.f, 100.f, 30.f, -30.f };
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(outputCellSet.GetConnectivityArray(vtkm::TopologyElementTagCell(),
|
|
vtkm::TopologyElementTagPoint()),
|
|
expectedConnectivity,
|
|
connectivitySize),
|
|
"Got incorrect conectivity");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(coords, expectedCoords, fieldSize), "Got incorrect coordinates");
|
|
|
|
VTKM_TEST_ASSERT(TestArrayHandle(scalars, expectedScalars, fieldSize), "Got incorrect scalars");
|
|
|
|
VTKM_TEST_ASSERT(
|
|
TestArrayHandle(cellvar, expectedCellvar.data(), static_cast<vtkm::Id>(expectedCellvar.size())),
|
|
"Got incorrect cellvar");
|
|
}
|
|
|
|
void TestClippingWithFunction()
|
|
{
|
|
std::cout << "Testing clipping with implicit function (sphere):" << std::endl;
|
|
TestClippingWithImplicitFunction();
|
|
TestClippingWithImplicitFunctionInverted();
|
|
}
|
|
|
|
int UnitTestClippingWithFunction(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::Run(TestClippingWithFunction, argc, argv);
|
|
}
|