Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix_ascent_warning'

Browse Source 
418347819 fix ascent warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3159
This commit is contained in:
Zhe Wang 2023-11-30 22:24:48 +00:00 committed by Kitware Robot
commit 82bf3d1afc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vtkm/filter/multi_block/testing/UnitTestMergeDataSetsFilter.cxx
View File

@ -356,7 +356,7 @@ void TestDifferentCoords()
vtkm::filter::multi_block::MergeDataSets mergeDataSets;
try
{
auto result = mergeDataSets.Execute(inputDataSets);
mergeDataSets.Execute(inputDataSets);
}
catch (vtkm::cont::ErrorExecution& e)
{
@ -375,7 +375,7 @@ void TestDifferentCoords()
inputDataSets2.AppendPartition(dataSet2);
try
{
auto result = mergeDataSets.Execute(inputDataSets2);
mergeDataSets.Execute(inputDataSets2);
}
catch (vtkm::cont::ErrorExecution& e)
{
@ -446,9 +446,6 @@ void TestMissingFieldsAndSameFieldName()
vtkm::cont::make_ArrayHandle<vtkm::Float32>(
{ 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f });
vtkm::cont::ArrayHandle<vtkm::Float32> validatePointVar2 =
vtkm::cont::make_ArrayHandle<vtkm::Float32>(
{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f });
vtkm::cont::ArrayHandle<vtkm::Float32> validatePointVar3 =
vtkm::cont::make_ArrayHandle<vtkm::Float32>(
{ 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f, 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f });
vtkm::cont::ArrayHandle<vtkm::Id> validateCellVar =
@ -479,7 +476,7 @@ void TestMissingFieldsAndSameFieldName()
test_equal_ArrayHandles(result.GetPartition(0)
.GetField("fieldSameName2", vtkm::cont::Field::Association::Points)
.GetData(),
validatePointVar3),
validatePointVar2),
"wrong fieldSameName2 values");
VTKM_TEST_ASSERT(
test_equal_ArrayHandles(result.GetPartition(0)