7be44c847f
Initially, the probe filter would simply not set a value if a sample was outside the input `DataSet`. This is not great as the memory could be left uninitalized and lead to unpredictable results. The testing compared these invalid results to 0, which seemed to work but is probably unstable. This was partially fixed by a previous change that consolidated to mapping of cell data with a general routine that permuted data. However, the fix did not extend to point data in the input, and it was not possible to specify a particular invalid value. This change specifically updates the probe filter so that invalid values are set to a user-specified value.
109 lines
3.4 KiB
C++
109 lines
3.4 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/MapFieldPermutation.h>
|
|
|
|
#include <vtkm/TypeList.h>
|
|
#include <vtkm/TypeTraits.h>
|
|
#include <vtkm/VecTraits.h>
|
|
|
|
#include <vtkm/cont/Logging.h>
|
|
|
|
#include <vtkm/cont/internal/CastInvalidValue.h>
|
|
|
|
#include <vtkm/worklet/WorkletMapField.h>
|
|
|
|
#include <vtkm/filter/PolicyDefault.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
template <typename T>
|
|
struct MapPermutationWorklet : vtkm::worklet::WorkletMapField
|
|
{
|
|
T InvalidValue;
|
|
|
|
explicit MapPermutationWorklet(T invalidValue)
|
|
: InvalidValue(invalidValue)
|
|
{
|
|
}
|
|
|
|
using ControlSignature = void(FieldIn permutationIndex, WholeArrayIn input, FieldOut output);
|
|
|
|
template <typename InputPortalType>
|
|
VTKM_EXEC void operator()(vtkm::Id permutationIndex, InputPortalType inputPortal, T& output) const
|
|
{
|
|
if ((permutationIndex >= 0) && (permutationIndex < inputPortal.GetNumberOfValues()))
|
|
{
|
|
output = inputPortal.Get(permutationIndex);
|
|
}
|
|
else
|
|
{
|
|
output = this->InvalidValue;
|
|
}
|
|
}
|
|
};
|
|
|
|
struct DoMapFieldPermutation
|
|
{
|
|
bool CalledMap = false;
|
|
|
|
template <typename T, typename S>
|
|
void operator()(const vtkm::cont::ArrayHandle<T, S>& inputArray,
|
|
const vtkm::cont::ArrayHandle<vtkm::Id>& permutation,
|
|
vtkm::cont::VariantArrayHandle& output,
|
|
vtkm::Float64 invalidValue)
|
|
{
|
|
vtkm::cont::ArrayHandle<T> outputArray;
|
|
MapPermutationWorklet<T> worklet(vtkm::cont::internal::CastInvalidValue<T>(invalidValue));
|
|
vtkm::cont::Invoker invoke;
|
|
invoke(worklet, permutation, inputArray, outputArray);
|
|
output = vtkm::cont::VariantArrayHandle(outputArray);
|
|
this->CalledMap = true;
|
|
}
|
|
};
|
|
|
|
} // anonymous namespace
|
|
|
|
bool vtkm::filter::MapFieldPermutation(const vtkm::cont::Field& inputField,
|
|
const vtkm::cont::ArrayHandle<vtkm::Id>& permutation,
|
|
vtkm::cont::Field& outputField,
|
|
vtkm::Float64 invalidValue)
|
|
{
|
|
vtkm::cont::VariantArrayHandle outputArray;
|
|
DoMapFieldPermutation functor;
|
|
inputField.GetData().ResetTypes<vtkm::TypeListAll>().CastAndCall(
|
|
vtkm::filter::PolicyDefault::StorageList{}, functor, permutation, outputArray, invalidValue);
|
|
if (functor.CalledMap)
|
|
{
|
|
outputField = vtkm::cont::Field(inputField.GetName(), inputField.GetAssociation(), outputArray);
|
|
}
|
|
else
|
|
{
|
|
VTKM_LOG_S(vtkm::cont::LogLevel::Warn, "Faild to map field " << inputField.GetName());
|
|
}
|
|
return functor.CalledMap;
|
|
}
|
|
|
|
bool vtkm::filter::MapFieldPermutation(const vtkm::cont::Field& inputField,
|
|
const vtkm::cont::ArrayHandle<vtkm::Id>& permutation,
|
|
vtkm::cont::DataSet& outputData,
|
|
vtkm::Float64 invalidValue)
|
|
{
|
|
vtkm::cont::Field outputField;
|
|
bool success =
|
|
vtkm::filter::MapFieldPermutation(inputField, permutation, outputField, invalidValue);
|
|
if (success)
|
|
{
|
|
outputData.AddField(outputField);
|
|
}
|
|
return success;
|
|
}
|