Merge topic 'probe-point-fields'

abedf61e5 Fix probe filter field mapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2555
This commit is contained in:
Sujin Philip 2021-08-12 18:09:53 +00:00 committed by Kitware Robot
commit 09e508cd86

@ -69,8 +69,17 @@ VTKM_CONT inline bool Probe::MapFieldOntoOutput(vtkm::cont::DataSet& result,
}
else if (field.IsFieldCell())
{
return vtkm::filter::MapFieldPermutation(
field, this->Worklet.GetCellIds(), result, this->InvalidValue);
vtkm::cont::Field outField;
if (vtkm::filter::MapFieldPermutation(
field, this->Worklet.GetCellIds(), outField, this->InvalidValue))
{
// output field should be associated with points
outField = vtkm::cont::Field(
field.GetName(), vtkm::cont::Field::Association::POINTS, outField.GetData());
result.AddField(outField);
return true;
}
return false;
}
else if (field.IsFieldGlobal())
{