Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ecpcitest
vtk-m
Commits
96424c83
Commit
96424c83
authored
Feb 15, 2021
by
Oliver Ruebel
Browse files
Fix bad ordering of args for CountLinkComponentsIn2DSlice in IsNecessary
parent
6ddb311c
Changes
1
Hide whitespace changes
Inline
Side-by-side
vtkm/worklet/contourtree_augmented/meshtypes/mesh_boundary/MeshBoundary3D.h
View file @
96424c83
...
...
@@ -234,13 +234,13 @@ public:
VTKM_ASSERT
(
pos
[
0
]
!=
0
&&
pos
[
0
]
!=
this
->
MeshStructure
.
MeshSize
[
0
]);
VTKM_ASSERT
(
pos
[
1
]
!=
0
&&
pos
[
1
]
!=
this
->
MeshStructure
.
MeshSize
[
1
]);
return
CountLinkComponentsIn2DSlice
(
meshIndex
,
vtkm
::
Id2
(
this
->
MeshStructure
.
MeshSize
[
0
]
,
1
))
!=
2
;
vtkm
::
Id2
(
1
,
this
->
MeshStructure
.
MeshSize
[
0
]))
!=
2
;
}
else
if
(
pos
[
1
]
==
0
||
pos
[
1
]
==
this
->
MeshStructure
.
MeshSize
[
1
]
-
1
)
{
// On [1]-perpendicular face
VTKM_ASSERT
(
pos
[
0
]
!=
0
&&
pos
[
0
]
!=
this
->
MeshStructure
.
MeshSize
[
0
]);
VTKM_ASSERT
(
pos
[
2
]
!=
0
&&
pos
[
2
]
!=
this
->
MeshStructure
.
MeshSize
[
2
]);
return
CountLinkComponentsIn2DSlice
(
meshIndex
,
vtkm
::
Id2
(
nPerSlice
,
1
))
!=
2
;
return
CountLinkComponentsIn2DSlice
(
meshIndex
,
vtkm
::
Id2
(
1
,
nPerSlice
))
!=
2
;
}
else
{
// On [0]-perpendicular face
...
...
@@ -248,7 +248,7 @@ public:
VTKM_ASSERT
(
pos
[
1
]
!=
0
&&
pos
[
1
]
!=
this
->
MeshStructure
.
MeshSize
[
1
]);
VTKM_ASSERT
(
pos
[
2
]
!=
0
&&
pos
[
2
]
!=
this
->
MeshStructure
.
MeshSize
[
2
]);
return
CountLinkComponentsIn2DSlice
(
meshIndex
,
vtkm
::
Id2
(
this
->
MeshStructure
.
MeshSize
[
0
]
,
nPerSlice
))
!=
2
;
meshIndex
,
vtkm
::
Id2
(
nPerSlice
,
this
->
MeshStructure
.
MeshSize
[
0
]))
!=
2
;
}
}
}
...
...
Atkins, Charles Vernon
@atkins3
mentioned in commit
561db99b
·
Feb 22, 2021
mentioned in commit
561db99b
mentioned in commit 561db99b30affb17eb4a456cfff68a10609a03b5
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment