Merge topic 'correct_serial_sort_by_key'

c9751b0d Serial SortByKey works now when the key is a ArrayHandleZip.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !295
This commit is contained in:
Robert Maynard 2015-12-31 15:13:17 -05:00 committed by Kitware Robot
commit b93658b403

@ -412,7 +412,7 @@ public:
/// More efficient sort:
/// Move value indexes when sorting and reorder the value array at last
typedef vtkm::cont::ArrayHandle<U,StorageU> ValueType;
typedef vtkm::cont::ArrayHandle<vtkm::Id,StorageU> IndexType;
typedef vtkm::cont::ArrayHandle<vtkm::Id> IndexType;
IndexType indexArray;
ValueType valuesScattered;