Merge topic 'more_moments_refactoring'

59bafd7a2 Update moments filter to reflect further changes to CreateResult.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1778
This commit is contained in:
Allison Vacanti 2019-08-16 12:22:54 +00:00 committed by Kitware Robot
commit 919bd3957e

@ -12,7 +12,6 @@
#define vtk_m_filter_ComputeMoments_hxx
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/filter/CreateResult.h>
#include <vtkm/worklet/moments/ComputeMoments.h>
namespace vtkm
@ -37,7 +36,8 @@ inline VTKM_CONT vtkm::cont::DataSet ComputeMoments::DoExecute(
throw vtkm::cont::ErrorBadValue("Active field for ComputeMoments must be a point field.");
}
vtkm::cont::DataSet output = vtkm::filter::CreateResult(input);
vtkm::cont::DataSet output;
output.CopyStructure(input);
auto worklet = vtkm::worklet::moments::ComputeMoments(this->Radius);