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

Fix compile errors after merging Dave's changes

Browse Source 
-Changes in the Worklets class which did not reflect
 changes from the Particles class
This commit is contained in:
Yenpure 2017-07-20 13:48:40 -04:00
parent 9e9b4f8838
commit 2aea25c889
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/particleadvection/ParticleAdvectionWorklets.h
View File

@ -65,7 +65,7 @@ public:
} }
else else
{ {
ic.SetStatusOutOfBounds(idx); ic.SetExitedSpatialBoundary(idx);
} }
} }
} }
@ -125,7 +125,7 @@ private:
vtkm::Id numSeeds = static_cast<vtkm::Id>(seedArray.GetNumberOfValues()); vtkm::Id numSeeds = static_cast<vtkm::Id>(seedArray.GetNumberOfValues());
//Allocate status and steps arrays. //Allocate status and steps arrays.
vtkm::cont::ArrayHandleConstant<vtkm::Id> ok(ParticleStatus::OK, numSeeds); vtkm::cont::ArrayHandleConstant<vtkm::Id> ok(ParticleStatus::STATUS_OK, numSeeds);
statusArray.Allocate(numSeeds); statusArray.Allocate(numSeeds);
DeviceAlgorithm::Copy(ok, statusArray); DeviceAlgorithm::Copy(ok, statusArray);
@ -216,7 +216,7 @@ private:
if (NeedParticleRounds && num > ParticlesPerRound) if (NeedParticleRounds && num > ParticlesPerRound)
num = ParticlesPerRound; num = ParticlesPerRound;
std::vector<vtkm::Id> steps((size_t)num, 0), status((size_t)num, ParticleStatus::OK); std::vector<vtkm::Id> steps((size_t)num, 0), status((size_t)num, ParticleStatus::STATUS_OK);
vtkm::cont::ArrayHandle<vtkm::Id> stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num); vtkm::cont::ArrayHandle<vtkm::Id> stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num);
vtkm::cont::ArrayHandle<vtkm::Id> statusArray = vtkm::cont::ArrayHandle<vtkm::Id> statusArray =
vtkm::cont::make_ArrayHandle(&status[0], num); vtkm::cont::make_ArrayHandle(&status[0], num);
@ -256,7 +256,7 @@ private:
if (NeedParticleRounds && num > ParticlesPerRound) if (NeedParticleRounds && num > ParticlesPerRound)
num = ParticlesPerRound; num = ParticlesPerRound;
std::vector<vtkm::Id> steps((size_t)num, 0), status((size_t)num, ParticleStatus::OK); std::vector<vtkm::Id> steps((size_t)num, 0), status((size_t)num, ParticleStatus::STATUS_OK);
vtkm::cont::ArrayHandle<vtkm::Id> stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num); vtkm::cont::ArrayHandle<vtkm::Id> stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num);
vtkm::cont::ArrayHandle<vtkm::Id> statusArray = vtkm::cont::ArrayHandle<vtkm::Id> statusArray =
vtkm::cont::make_ArrayHandle(&status[0], num); vtkm::cont::make_ArrayHandle(&status[0], num);