From 2aea25c88917fdf1c5244e62aa01f71c2d7b9ac2 Mon Sep 17 00:00:00 2001 From: Yenpure Date: Thu, 20 Jul 2017 13:48:40 -0400 Subject: [PATCH] Fix compile errors after merging Dave's changes -Changes in the Worklets class which did not reflect changes from the Particles class --- .../worklet/particleadvection/ParticleAdvectionWorklets.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h b/vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h index 3e0bb103b..1ad6e53ba 100644 --- a/vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h +++ b/vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h @@ -65,7 +65,7 @@ public: } else { - ic.SetStatusOutOfBounds(idx); + ic.SetExitedSpatialBoundary(idx); } } } @@ -125,7 +125,7 @@ private: vtkm::Id numSeeds = static_cast(seedArray.GetNumberOfValues()); //Allocate status and steps arrays. - vtkm::cont::ArrayHandleConstant ok(ParticleStatus::OK, numSeeds); + vtkm::cont::ArrayHandleConstant ok(ParticleStatus::STATUS_OK, numSeeds); statusArray.Allocate(numSeeds); DeviceAlgorithm::Copy(ok, statusArray); @@ -216,7 +216,7 @@ private: if (NeedParticleRounds && num > ParticlesPerRound) num = ParticlesPerRound; - std::vector steps((size_t)num, 0), status((size_t)num, ParticleStatus::OK); + std::vector steps((size_t)num, 0), status((size_t)num, ParticleStatus::STATUS_OK); vtkm::cont::ArrayHandle stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num); vtkm::cont::ArrayHandle statusArray = vtkm::cont::make_ArrayHandle(&status[0], num); @@ -256,7 +256,7 @@ private: if (NeedParticleRounds && num > ParticlesPerRound) num = ParticlesPerRound; - std::vector steps((size_t)num, 0), status((size_t)num, ParticleStatus::OK); + std::vector steps((size_t)num, 0), status((size_t)num, ParticleStatus::STATUS_OK); vtkm::cont::ArrayHandle stepArray = vtkm::cont::make_ArrayHandle(&steps[0], num); vtkm::cont::ArrayHandle statusArray = vtkm::cont::make_ArrayHandle(&status[0], num);