Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Optimize cellID bin check.

Browse Source
This commit is contained in:
Dave Pugmire 2023-08-30 12:04:05 -04:00
parent 0c86e3277b
commit 9fb58dcf1e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtkm/exec/CellLocatorUniformBins.h
View File

@ -101,7 +101,8 @@ public:
//See if it's in the last bin. //See if it's in the last bin.
if ((lastCell.BinIdx >= 0) && (lastCell.BinIdx < this->CellIds.GetNumberOfValues()) && if ((lastCell.BinIdx >= 0) && (lastCell.BinIdx < this->CellIds.GetNumberOfValues()) &&
this->PointInBin(point, lastCell.BinIdx, cellId, pc) == vtkm::ErrorCode::Success) this->PointInBin(point, lastCell.BinIdx, cellId, pc, lastCell.CellId) ==
vtkm::ErrorCode::Success)
{ {
parametric = pc; parametric = pc;
lastCell.CellId = cellId; lastCell.CellId = cellId;
@ -210,15 +211,16 @@ private:
vtkm::ErrorCode PointInBin(const vtkm::Vec3f& point, vtkm::ErrorCode PointInBin(const vtkm::Vec3f& point,
const vtkm::Id& binIdx, const vtkm::Id& binIdx,
vtkm::Id& cellId, vtkm::Id& cellId,
vtkm::Vec3f& parametric) const vtkm::Vec3f& parametric,
const vtkm::Id& lastCellId = -1) const
{ {
auto binIds = this->CellIds.Get(binIdx); auto binIds = this->CellIds.Get(binIdx);
vtkm::Vec3f pc;
for (vtkm::IdComponent i = 0; i < binIds.GetNumberOfComponents(); i++) for (vtkm::IdComponent i = 0; i < binIds.GetNumberOfComponents(); i++)
{ {
vtkm::Id cid = binIds[i]; vtkm::Id cid = binIds[i];
vtkm::Vec3f pc; if (cid != lastCellId && this->PointInCell(point, cid, pc) == vtkm::ErrorCode::Success)
if (this->PointInCell(point, cid, pc) == vtkm::ErrorCode::Success)
{ {
cellId = cid; cellId = cid;
parametric = pc; parametric = pc;