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

More uses of ArrayGetValue where appropriate

Browse Source
This commit is contained in:
Gunther H. Weber 2021-03-26 13:44:54 -07:00
parent 85503c55d3
commit 39aad140ef
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vtkm/worklet/contourtree_augmented/ContourTreeMaker.h
View File

@ -223,7 +223,7 @@ inline void ContourTreeMaker::ComputeHyperAndSuperStructure()
// test for final edges meeting
if (this->ActiveSupernodes.GetNumberOfValues() == 1)
{ // meet at a vertex
vtkm::Id superID = this->ActiveSupernodes.ReadPortal().Get(0);
vtkm::Id superID = ArrayGetValue(0, this->ActiveSupernodes);
this->ContourTreeResult.Superarcs.WritePortal().Set(superID,
static_cast<vtkm::Id>(NO_SUCH_ELEMENT));
this->ContourTreeResult.Hyperarcs.WritePortal().Set(superID,
@ -315,21 +315,11 @@ inline void ContourTreeMaker::ComputeHyperAndSuperStructure()
this->ContourTreeResult.WhenTransferred, oneIfHypernodeFunctor);
vtkm::cont::Algorithm::ScanExclusive(oneIfHypernodeArrayHandle, newHypernodePosition);
vtkm::Id nHypernodes = 0;
{
vtkm::cont::ArrayHandle<vtkm::Id> temp;
temp.Allocate(2);
vtkm::cont::Algorithm::CopySubRange(
newHypernodePosition, newHypernodePosition.GetNumberOfValues() - 1, 1, temp);
vtkm::cont::Algorithm::CopySubRange(
this->ContourTreeResult.WhenTransferred,
this->ContourTreeResult.WhenTransferred.GetNumberOfValues() - 1,
1,
temp,
1);
auto portal = temp.ReadPortal();
nHypernodes = portal.Get(0) + oneIfHypernodeFunctor(portal.Get(1));
}
vtkm::Id nHypernodes =
ArrayGetValue(newHypernodePosition.GetNumberOfValues() - 1, newHypernodePosition) +
oneIfHypernodeFunctor(
ArrayGetValue(this->ContourTreeResult.WhenTransferred.GetNumberOfValues() - 1,
this->ContourTreeResult.WhenTransferred));
IdArrayType newHypernodes;
newHypernodes.Allocate(nHypernodes);