Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-mask-scatter-size'

Browse Source 
472528822 Fix the size of Mask and ScatterPermutation arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3037
This commit is contained in:
Kenneth Moreland 2023-04-12 21:36:08 +00:00 committed by Kitware Robot
commit 42b364b416
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/worklet/ScatterPermutation.h
View File

@ -59,7 +59,10 @@ public:
VTKM_CONT OutputToInputMapType GetOutputToInputMap() const { return this->Permutation; }
VTKM_CONT
VisitArrayType GetVisitArray(vtkm::Id inputRange) const { return VisitArrayType(0, inputRange); }
VisitArrayType GetVisitArray(vtkm::Id inputRange) const
{
return VisitArrayType(0, this->GetOutputRange(inputRange));
}
VTKM_CONT
VisitArrayType GetVisitArray(vtkm::Id3 inputRange) const

2
vtkm/worklet/internal/DispatcherBase.h
View File

@ -759,7 +759,7 @@ private:
// Get the arrays used for masking output elements.
typename MaskType::ThreadToOutputMapType threadToOutputMap =
this->Mask.GetThreadToOutputMap(inputRange);
this->Mask.GetThreadToOutputMap(outputRange);
// Replace the parameters in the invocation with the execution object and
// pass to next step of Invoke. Also add the scatter information.