Commit 548ea5ee authored by Dave Pugmire's avatar Dave Pugmire Committed by Kitware Robot
Browse files

Merge topic 'add_SOA_to_default_types'

799dbacd Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_SOA_to_default_types
21a31370 kick the builds
565522eb

 Add ArrayHandleSOA to default
Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarKenneth Moreland <kmorel@acm.org>
Merge-request: !2430
parents 58bd890c 799dbacd
......@@ -48,6 +48,7 @@
#ifndef VTKM_DEFAULT_STORAGE_LIST
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
#include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
#include <vtkm/cont/ArrayHandleSOA.h>
#include <vtkm/cont/StorageList.h>
namespace vtkm
{
......@@ -59,11 +60,11 @@ namespace internal
using StorageListField = vtkm::ListAppend<
vtkm::cont::StorageListBasic,
vtkm::List<
vtkm::cont::StorageTagSOA,
vtkm::cont::StorageTagUniformPoints,
vtkm::cont::StorageTagCartesianProduct<vtkm::cont::StorageTagBasic,
vtkm::cont::StorageTagBasic,
vtkm::cont::StorageTagBasic>>>;
}
}
} // namespace vtkm::cont
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment