Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix crash caused by AttachmentSuperparentAndIndexComparator.h

Browse Source
This commit is contained in:
Gunther H. Weber 2021-09-23 14:03:06 -07:00
parent f22af2d1c3
commit 1163cfa563
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vtkm/worklet/contourtree_distributed/hierarchical_augmenter/AttachmentSuperparentAndIndexComparator.h
View File

@ -99,6 +99,11 @@ public:
VTKM_EXEC
bool operator()(const vtkm::Id& left, const vtkm::Id& right) const
{ // operator()
if (left == right)
{
return false;
}
// first comparison is on superparent WITHOUT ascending descending flag
if (vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(left)) <
vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(right)))
@ -110,6 +115,7 @@ public:
{
return false;
}
// second comparison is on global regular Id
if (this->GlobalRegularIdsPortal.Get(left) < this->GlobalRegularIdsPortal.Get(right))
{
@ -120,31 +126,19 @@ public:
return !vtkm::worklet::contourtree_augmented::IsAscending(this->SuperparentsPortal.Get(left));
}
// third comparison is on supernode IDs
if (vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(left)) <
vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(right)))
{
return true;
}
if (vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(left)) >
vtkm::worklet::contourtree_augmented::MaskedIndex(this->SuperparentsPortal.Get(right)))
{
return false;
}
/*
// third comparison is on supernode Ids
if (!vtkm::worklet::contourtree_augmented::NoSuchElement(this->SupernodeIdsPortal.Get(left)))
{
return true;
}
else if (!vtkm::worklet::contourtree_augmented::NoSuchElement(this->SupernodeIdsPortal.Get(right)))
else if (!vtkm::worklet::contourtree_augmented::NoSuchElement(
this->SupernodeIdsPortal.Get(right)))
{
return false;
}
*/
// in this case, both were NSE, so sort on the index values
return (left < right);
} // operator()
private: