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 ```
179 lines
6.3 KiB
C++
179 lines
6.3 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/DispatcherMapTopology.h>
|
|
#include <vtkm/worklet/WorkletMapTopology.h>
|
|
|
|
#include <vtkm/worklet/CellAverage.h>
|
|
#include <vtkm/worklet/PointAverage.h>
|
|
|
|
#include <vtkm/Math.h>
|
|
|
|
#include <vtkm/cont/DataSet.h>
|
|
#include <vtkm/cont/DeviceAdapterTag.h>
|
|
|
|
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
|
#include <vtkm/cont/testing/Testing.h>
|
|
|
|
namespace test_explicit
|
|
{
|
|
|
|
class MaxPointOrCellValue : public vtkm::worklet::WorkletVisitCellsWithPoints
|
|
{
|
|
public:
|
|
using ControlSignature = void(FieldInCell inCells,
|
|
FieldInPoint inPoints,
|
|
CellSetIn topology,
|
|
FieldOutCell outCells);
|
|
using ExecutionSignature = void(_1, _4, _2, PointCount, CellShape, PointIndices);
|
|
using InputDomain = _3;
|
|
|
|
VTKM_CONT
|
|
MaxPointOrCellValue() {}
|
|
|
|
template <typename InCellType,
|
|
typename OutCellType,
|
|
typename InPointVecType,
|
|
typename CellShapeTag,
|
|
typename PointIndexType>
|
|
VTKM_EXEC void operator()(const InCellType& cellValue,
|
|
OutCellType& maxValue,
|
|
const InPointVecType& pointValues,
|
|
const vtkm::IdComponent& numPoints,
|
|
const CellShapeTag& vtkmNotUsed(type),
|
|
const PointIndexType& vtkmNotUsed(pointIDs)) const
|
|
{
|
|
//simple functor that returns the max of cellValue and pointValue
|
|
maxValue = static_cast<OutCellType>(cellValue);
|
|
for (vtkm::IdComponent pointIndex = 0; pointIndex < numPoints; ++pointIndex)
|
|
{
|
|
maxValue = vtkm::Max(maxValue, static_cast<OutCellType>(pointValues[pointIndex]));
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
namespace
|
|
{
|
|
|
|
static void TestMaxPointOrCell();
|
|
static void TestAvgPointToCell();
|
|
static void TestAvgCellToPoint();
|
|
|
|
void TestWorkletMapTopologyExplicit(vtkm::cont::DeviceAdapterId id)
|
|
{
|
|
std::cout << "Testing Topology Worklet ( Explicit ) on device adapter: " << id.GetName()
|
|
<< std::endl;
|
|
|
|
TestMaxPointOrCell();
|
|
TestAvgPointToCell();
|
|
TestAvgCellToPoint();
|
|
}
|
|
|
|
static void TestMaxPointOrCell()
|
|
{
|
|
std::cout << "Testing MaxPointOfCell worklet" << std::endl;
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet0();
|
|
auto cellset = dataSet.GetCellSet(0).Cast<vtkm::cont::CellSetExplicit<>>();
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
|
|
vtkm::worklet::DispatcherMapTopology<::test_explicit::MaxPointOrCellValue> dispatcher;
|
|
dispatcher.Invoke(
|
|
dataSet.GetField("cellvar").GetData().ResetTypes(vtkm::TypeListTagFieldScalar()),
|
|
dataSet.GetField("pointvar").GetData().ResetTypes(vtkm::TypeListTagFieldScalar()),
|
|
&cellset,
|
|
result);
|
|
|
|
std::cout << "Make sure we got the right answer." << std::endl;
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(0), 100.1f),
|
|
"Wrong result for PointToCellMax worklet");
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(1), 100.2f),
|
|
"Wrong result for PointToCellMax worklet");
|
|
}
|
|
|
|
static void TestAvgPointToCell()
|
|
{
|
|
std::cout << "Testing AvgPointToCell worklet" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet0();
|
|
auto cellset = dataSet.GetCellSet();
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellAverage> dispatcher;
|
|
dispatcher.Invoke(&cellset, dataSet.GetField("pointvar"), &result);
|
|
|
|
std::cout << "Make sure we got the right answer." << std::endl;
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(0), 20.1333f),
|
|
"Wrong result for PointToCellAverage worklet");
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(1), 35.2f),
|
|
"Wrong result for PointToCellAverage worklet");
|
|
|
|
std::cout << "Try to invoke with an input array of the wrong size." << std::endl;
|
|
bool exceptionThrown = false;
|
|
try
|
|
{
|
|
dispatcher.Invoke(dataSet.GetCellSet(),
|
|
dataSet.GetField("cellvar"), // should be pointvar
|
|
result);
|
|
}
|
|
catch (vtkm::cont::ErrorBadValue& error)
|
|
{
|
|
std::cout << " Caught expected error: " << error.GetMessage() << std::endl;
|
|
exceptionThrown = true;
|
|
}
|
|
VTKM_TEST_ASSERT(exceptionThrown, "Dispatcher did not throw expected exception.");
|
|
}
|
|
|
|
static void TestAvgCellToPoint()
|
|
{
|
|
std::cout << "Testing AvgCellToPoint worklet" << std::endl;
|
|
|
|
vtkm::cont::testing::MakeTestDataSet testDataSet;
|
|
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet1();
|
|
auto field = dataSet.GetField("cellvar");
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Float32> result;
|
|
|
|
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::PointAverage> dispatcher;
|
|
dispatcher.Invoke(dataSet.GetCellSet(), &field, result);
|
|
|
|
std::cout << "Make sure we got the right answer." << std::endl;
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(0), 100.1f),
|
|
"Wrong result for CellToPointAverage worklet");
|
|
VTKM_TEST_ASSERT(test_equal(result.GetPortalConstControl().Get(1), 100.15f),
|
|
"Wrong result for CellToPointAverage worklet");
|
|
|
|
std::cout << "Try to invoke with an input array of the wrong size." << std::endl;
|
|
bool exceptionThrown = false;
|
|
try
|
|
{
|
|
dispatcher.Invoke(dataSet.GetCellSet(),
|
|
dataSet.GetField("pointvar"), // should be cellvar
|
|
result);
|
|
}
|
|
catch (vtkm::cont::ErrorBadValue& error)
|
|
{
|
|
std::cout << " Caught expected error: " << error.GetMessage() << std::endl;
|
|
exceptionThrown = true;
|
|
}
|
|
VTKM_TEST_ASSERT(exceptionThrown, "Dispatcher did not throw expected exception.");
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
int UnitTestWorkletMapTopologyExplicit(int argc, char* argv[])
|
|
{
|
|
return vtkm::cont::testing::Testing::RunOnDevice(TestWorkletMapTopologyExplicit, argc, argv);
|
|
}
|