Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Particle advection grid evaluators testing fix

Browse Source
This commit is contained in:
ayenpure 2017-08-08 23:03:08 -04:00
parent 9714ea36fa
commit bc259e1523
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/worklet/testing/UnitTestParticleAdvection.cxx
View File

@ -199,6 +199,7 @@ void ValidateEvaluator(const EvalType& eval,
const vtkm::Vec<FieldType, 3>& vec, const vtkm::Vec<FieldType, 3>& vec,
const std::string& msg) const std::string& msg)
{ {
typedef VTKM_DEFAULT_DEVICE_ADAPTER_TAG DeviceAdapter;
typedef TestEvaluatorWorklet<FieldType, EvalType> EvalTester; typedef TestEvaluatorWorklet<FieldType, EvalType> EvalTester;
typedef vtkm::worklet::DispatcherMapField<EvalTester> EvalTesterDispatcher; typedef vtkm::worklet::DispatcherMapField<EvalTester> EvalTesterDispatcher;
EvalTester evalTester(eval); EvalTester evalTester(eval);
@ -206,10 +207,11 @@ void ValidateEvaluator(const EvalType& eval,
vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> pointsHandle = vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> pointsHandle =
vtkm::cont::make_ArrayHandle(pointIns); vtkm::cont::make_ArrayHandle(pointIns);
vtkm::Id numPoints = pointsHandle.GetNumberOfValues(); vtkm::Id numPoints = pointsHandle.GetNumberOfValues();
pointsHandle.PrepareForInput(DeviceAdapter());
vtkm::cont::ArrayHandle<bool> evalStatus; vtkm::cont::ArrayHandle<bool> evalStatus;
vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> evalResults; vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> evalResults;
evalStatus.Allocate(numPoints); evalStatus.PrepareForOutput(numPoints, DeviceAdapter());
evalResults.Allocate(numPoints); evalResults.PrepareForOutput(numPoints, DeviceAdapter());
evalTesterDispatcher.Invoke(pointsHandle, evalStatus, evalResults); evalTesterDispatcher.Invoke(pointsHandle, evalStatus, evalResults);
auto statusPortal = evalStatus.GetPortalConstControl(); auto statusPortal = evalStatus.GetPortalConstControl();
auto resultsPortal = evalResults.GetPortalConstControl(); auto resultsPortal = evalResults.GetPortalConstControl();
@ -242,8 +244,6 @@ void TestEvaluators()
typedef vtkm::Float32 FieldType; typedef vtkm::Float32 FieldType;
typedef vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> FieldHandle; typedef vtkm::cont::ArrayHandle<vtkm::Vec<FieldType, 3>> FieldHandle;
typedef FieldHandle::template ExecutionTypes<DeviceAdapter>::PortalConst FieldPortalConstType; typedef FieldHandle::template ExecutionTypes<DeviceAdapter>::PortalConst FieldPortalConstType;
//typedef typename vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter> DeviceAlgorithm;
//Constant field evaluator and RK4 integrator. //Constant field evaluator and RK4 integrator.
typedef vtkm::worklet::particleadvection::ConstantField<FieldType> CEvalType; typedef vtkm::worklet::particleadvection::ConstantField<FieldType> CEvalType;