Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'probe-interp-any-field'

Browse Source 
eddf6df38 Update probe filter to interpolate any field type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2980
This commit is contained in:
Kenneth Moreland 2023-02-06 21:59:46 +00:00 committed by Kitware Robot
commit f916a5e1f3
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog/interp-any-field.md
View File

@ -19,7 +19,8 @@ fallback is used.
* `ClipWithImplicitFunction`
* `Contour`
* `MIRFilter`
* `PointAverage`
* `NDHistogram`
* `ParticleDensityCloudInCell`
* `ParticleDensityNearestGridPoint`
* `PointAverage`
* `Probe`

35
vtkm/filter/resampling/Probe.cxx
View File

@ -30,15 +30,34 @@ bool DoMapField(vtkm::cont::DataSet& result,
{
if (field.IsPointField())
{
auto resolve = [&](const auto& concrete) {
using T = typename std::decay_t<decltype(concrete)>::ValueType;
vtkm::cont::ArrayHandle<T> outputArray = worklet.ProcessPointField(
concrete, vtkm::cont::internal::CastInvalidValue<T>(invalidValue));
result.AddPointField(field.GetName(), outputArray);
vtkm::cont::UnknownArrayHandle inArray = field.GetData();
vtkm::cont::UnknownArrayHandle outArray = inArray.NewInstanceBasic();
bool called = false;
auto tryType = [&](auto t) {
using T = std::decay_t<decltype(t)>;
if (!called && inArray.IsBaseComponentType<T>())
{
called = true;
vtkm::IdComponent numComponents = inArray.GetNumberOfComponentsFlat();
VTKM_ASSERT(numComponents == outArray.GetNumberOfComponentsFlat());
for (vtkm::IdComponent cIndex = 0; cIndex < numComponents; ++cIndex)
{
worklet.ProcessPointField(inArray.ExtractComponent<T>(cIndex),
outArray.ExtractComponent<T>(cIndex, vtkm::CopyFlag::Off),
vtkm::cont::internal::CastInvalidValue<T>(invalidValue));
}
}
};
field.GetData()
.CastAndCallForTypesWithFloatFallback<vtkm::TypeListField, VTKM_DEFAULT_STORAGE_LIST>(
resolve);
vtkm::ListForEach(tryType, vtkm::TypeListScalarAll{});
if (!called)
{
VTKM_LOG_CAST_FAIL(worklet, vtkm::TypeListScalarAll);
return false;
}
result.AddPointField(field.GetName(), outArray);
return true;
}
else if (field.IsCellField())

18
vtkm/filter/resampling/worklet/Probe.h
View File

@ -217,24 +217,22 @@ public:
};
/// Intepolate the input point field data at the points of the geometry
template <typename T,
typename Storage,
template <typename InArrayType,
typename OutArrayType,
typename ComponentType,
typename InputCellSetTypeList = VTKM_DEFAULT_CELL_SET_LIST>
vtkm::cont::ArrayHandle<T> ProcessPointField(
const vtkm::cont::ArrayHandle<T, Storage>& field,
const T& invalidValue,
InputCellSetTypeList icsTypes = InputCellSetTypeList()) const
void ProcessPointField(const InArrayType& field,
const OutArrayType& result,
ComponentType invalidValue,
InputCellSetTypeList icsTypes = InputCellSetTypeList()) const
{
vtkm::cont::ArrayHandle<T> result;
vtkm::cont::Invoker invoke;
invoke(InterpolatePointField<T>(invalidValue),
invoke(InterpolatePointField<ComponentType>(invalidValue),
this->CellIds,
this->ParametricCoordinates,
this->InputCellSet.ResetCellSetList(icsTypes),
field,
result);
return result;
}
vtkm::cont::ArrayHandle<vtkm::Id> GetCellIds() const { return this->CellIds; }