Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split array access into separate lines and add VTKM_ASSERT

Browse Source
This commit is contained in:
Gunther H. Weber 2021-01-27 19:31:56 -08:00
parent 0a33737eae
commit 0183db6854
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vtkm/worklet/contourtree_augmented/meshtypes/MeshStructureMarchingCubes.h
View File

@ -313,22 +313,38 @@ public:
caseNo |= (vtkm::UInt8)(1 << vtxNo); caseNo |= (vtkm::UInt8)(1 << vtxNo);
} }
} }
const auto& vertex_permutation = CubeVertexPermutationsPortal.Get(permIndex);
if (getMaxComponents) if (getMaxComponents)
{ {
for (int edgeNo = 0; edgeNo < 3; ++edgeNo) for (int edgeNo = 0; edgeNo < 3; ++edgeNo)
{ {
if (InCubeConnectionsSixPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo)) if (InCubeConnectionsSixPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo))
{ {
int root0 = CubeVertexPermutationsPortal.Get( const auto& edge = LinkVertexConnectionsSixPortal.Get(edgeNo);
permIndex)[LinkVertexConnectionsSixPortal.Get(edgeNo)[0]]; vtkm::IdComponent edge0 = edge[0];
vtkm::IdComponent edge1 = edge[1];
VTKM_ASSERT(0 <= edge0 && edge0 < CubeVertexPermutations_PermVecLength);
VTKM_ASSERT(0 <= edge1 && edge1 < CubeVertexPermutations_PermVecLength);
int root0 = vertex_permutation[edge0];
int root1 = vertex_permutation[edge1];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
while (parentId[root0] != root0) while (parentId[root0] != root0)
{
root0 = parentId[root0]; root0 = parentId[root0];
int root1 = CubeVertexPermutationsPortal.Get( VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
permIndex)[LinkVertexConnectionsSixPortal.Get(edgeNo)[1]]; }
while (parentId[root1] != root1) while (parentId[root1] != root1)
{
root1 = parentId[root1]; root1 = parentId[root1];
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
}
if (root0 != root1) if (root0 != root1)
{
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
parentId[root1] = root0; parentId[root1] = root0;
}
} }
} }
} }
@ -338,16 +354,30 @@ public:
{ {
if (InCubeConnectionsEighteenPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo)) if (InCubeConnectionsEighteenPortal.Get(caseNo) & (static_cast<vtkm::Id>(1) << edgeNo))
{ {
int root0 = CubeVertexPermutationsPortal.Get( const auto& edge = LinkVertexConnectionsEighteenPortal.Get(edgeNo);
permIndex)[LinkVertexConnectionsEighteenPortal.Get(edgeNo)[0]]; vtkm::IdComponent edge0 = edge[0];
vtkm::IdComponent edge1 = edge[1];
VTKM_ASSERT(0 <= edge0 && edge0 < CubeVertexPermutations_PermVecLength);
VTKM_ASSERT(0 <= edge1 && edge1 < CubeVertexPermutations_PermVecLength);
int root0 = vertex_permutation[edge0];
int root1 = vertex_permutation[edge1];
VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
while (parentId[root0] != root0) while (parentId[root0] != root0)
{
root0 = parentId[root0]; root0 = parentId[root0];
int root1 = CubeVertexPermutationsPortal.Get( VTKM_ASSERT(0 <= root0 && root0 < N_ALL_NEIGHBOURS);
permIndex)[LinkVertexConnectionsEighteenPortal.Get(edgeNo)[1]]; }
while (parentId[root1] != root1) while (parentId[root1] != root1)
{
root1 = parentId[root1]; root1 = parentId[root1];
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
}
if (root0 != root1) if (root0 != root1)
{
VTKM_ASSERT(0 <= root1 && root1 < N_ALL_NEIGHBOURS);
parentId[root1] = root0; parentId[root1] = root0;
}
} }
} }
} }