Vtkm pointer (#210)

* do the new way of vtkm pointers * get rid of depracated calls
Alpine-DAV · May 7, 2021 · 3449e5d · 3449e5d
1 parent deed78e
commit 3449e5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/vtkh/filters/HistSampling.cpp b/src/vtkh/filters/HistSampling.cpp
@@ -7,7 +7,6 @@
 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
 
-#include <vtkm/cont/DataSetFieldAdd.h>
 #include <vtkm/worklet/FieldStatistics.h>
 #include <vtkm/filter/CreateResult.h>
 #include <vtkm/cont/ArrayHandleTransform.h>
@@ -341,15 +340,13 @@ void HistSampling::DoExecute()
     vtkm::cont::ArrayHandle <vtkm::Float32> output;
     vtkm::cont::Algorithm ::Copy(stencilBool , output );
 
-    vtkm::cont:: DataSetFieldAdd dataSetFieldAdd;
-
     if(assoc == vtkm::cont::Field::Association::POINTS)
     {
-      dataSetFieldAdd.AddPointField(dom , "valSampled", output );
+      dom.AddPointField("valSampled", output);
     }
     else
     {
-      dataSetFieldAdd.AddCellField(dom , "valSampled", output );
+      dom.AddCellField("valSampled", output);
     }
   }
 

diff --git a/src/vtkh/utils/vtkm_array_utils.hpp b/src/vtkh/utils/vtkm_array_utils.hpp
@@ -2,19 +2,14 @@
 #define VTKH_VTKM_ARRAY_UTILS_HPP
 
 #include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/serial/internal/DeviceAdapterTagSerial.h>
 
 namespace vtkh {
 
 template<typename T>
 T *
 GetVTKMPointer(vtkm::cont::ArrayHandle<T> &handle)
 {
-  typedef typename vtkm::cont::ArrayHandle<T> HandleType;
-  typedef typename HandleType::template ExecutionTypes<vtkm::cont::DeviceAdapterTagSerial>::Portal PortalType;
-  typedef typename vtkm::cont::ArrayPortalToIterators<PortalType>::IteratorType IteratorType;
-  IteratorType iter = vtkm::cont::ArrayPortalToIterators<PortalType>(handle.WritePortal()).GetBegin();
-  return &(*iter);
+  return handle.WritePortal().GetArray();
 }
 
 }//namespace vtkh