From 6f509a8b4a33cc79617fe1ac976c944fac3fdb8f Mon Sep 17 00:00:00 2001 From: dongliangchu Date: Thu, 24 Aug 2017 16:46:35 -0400 Subject: [PATCH] reviewed version 1 --- .../testing/UnitTestMultiBlockFilters.cxx | 84 +------------------ 1 file changed, 2 insertions(+), 82 deletions(-) diff --git a/vtkm/filter/testing/UnitTestMultiBlockFilters.cxx b/vtkm/filter/testing/UnitTestMultiBlockFilters.cxx index 644791ea4..8f6f7b5d7 100644 --- a/vtkm/filter/testing/UnitTestMultiBlockFilters.cxx +++ b/vtkm/filter/testing/UnitTestMultiBlockFilters.cxx @@ -19,8 +19,6 @@ //============================================================================ #include - -<<<<<<< HEAD #include #include #include @@ -36,23 +34,7 @@ #include #include #include -======= -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d template vtkm::cont::MultiBlock MultiBlockBuilder(std::size_t BlockNum, std::string FieldName) @@ -60,7 +42,7 @@ vtkm::cont::MultiBlock MultiBlockBuilder(std::size_t BlockNum, std::string Field vtkm::cont::DataSetBuilderUniform dataSetBuilder; vtkm::cont::DataSet dataSet; vtkm::cont::DataSetFieldAdd dsf; -<<<<<<< HEAD + vtkm::Vec origin(0); vtkm::Vec spacing(1); vtkm::cont::MultiBlock Blocks; @@ -71,39 +53,19 @@ vtkm::cont::MultiBlock MultiBlockBuilder(std::size_t BlockNum, std::string Field if (FieldName == "cellvar") { vtkm::Id numCells = (dimensions[0] - 1) * (dimensions[1] - 1); -======= - vtkm::Vec origin(0); - vtkm::Vec spacing(1); - vtkm::cont::MultiBlock Blocks; - for (vtkm::Id BlockId = 0; BlockId < static_cast(BlockNum); BlockId++) - { - vtkm::Id2 dimensions((BlockId + 2) * (BlockId + 2), (BlockId + 2) * (BlockId + 2)); - if (FieldName == "cellvar") - { - vtkm::Id numCells = (dimensions[0] - 1) * (dimensions[1] - 1); ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d std::vector varC2D(static_cast(numCells)); for (vtkm::Id i = 0; i < numCells; i++) { varC2D[static_cast(i)] = static_cast(BlockId * i); } dataSet = dataSetBuilder.Create(vtkm::Id2(dimensions[0], dimensions[1]), -<<<<<<< HEAD vtkm::Vec(origin[0], origin[1]), vtkm::Vec(spacing[0], spacing[1])); dsf.AddCellField(dataSet, "cellvar", varC2D); } if (FieldName == "pointvar") -======= - vtkm::Vec(origin[0], origin[1]), - vtkm::Vec(spacing[0], spacing[1])); - dsf.AddCellField(dataSet, "cellvar", varC2D); - } - - if (FieldName == "pointvar") ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d { vtkm::Id numPoints = dimensions[0] * dimensions[1]; std::vector varP2D(static_cast(numPoints)); @@ -112,29 +74,19 @@ vtkm::cont::MultiBlock MultiBlockBuilder(std::size_t BlockNum, std::string Field varP2D[static_cast(i)] = static_cast(BlockId); } dataSet = dataSetBuilder.Create(vtkm::Id2(dimensions[0], dimensions[1]), -<<<<<<< HEAD vtkm::Vec(origin[0], origin[1]), vtkm::Vec(spacing[0], spacing[1])); -======= - vtkm::Vec(origin[0], origin[1]), - vtkm::Vec(spacing[0], spacing[1])); ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d dsf.AddPointField(dataSet, "pointvar", varP2D); } Blocks.AddBlock(dataSet); -<<<<<<< HEAD } -======= - } ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d return Blocks; } template void Result_Verify(T ResultVec, D Filter, vtkm::cont::MultiBlock& Blocks, std::string FieldName) { VTKM_TEST_ASSERT(ResultVec.size() == static_cast(Blocks.GetNumberOfBlocks()), -<<<<<<< HEAD "result block number incorrect"); for (vtkm::Id j = 0; static_cast(j) < ResultVec.size(); j++) { @@ -144,24 +96,12 @@ void Result_Verify(T ResultVec, D Filter, vtkm::cont::MultiBlock& Blocks, std::s ResultVec[static_cast(j)].GetField().GetData().GetNumberOfValues() == BlockResult.GetField().GetData().GetNumberOfValues(), "result vectors' size incorrect"); -======= - "result block number incorrect"); - for (vtkm::Id j = 0; static_cast(j) < ResultVec.size(); j++) - { - vtkm::filter::ResultField BlockResult = Filter.Execute(Blocks.GetBlock(j), FieldName); - - VTKM_TEST_ASSERT( - ResultVec[static_cast(j)].GetField().GetData().GetNumberOfValues() == - BlockResult.GetField().GetData().GetNumberOfValues(), - "result vectors' size incorrect"); ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d vtkm::cont::ArrayHandle MBlockArray; ResultVec[static_cast(j)].GetField().GetData().CopyTo(MBlockArray); vtkm::cont::ArrayHandle SDataSetArray; BlockResult.GetField().GetData().CopyTo(SDataSetArray); -<<<<<<< HEAD for (vtkm::Id i = 0; i < ResultVec[static_cast(j)].GetField().GetData().GetNumberOfValues(); i++) @@ -172,28 +112,12 @@ void Result_Verify(T ResultVec, D Filter, vtkm::cont::MultiBlock& Blocks, std::s } } return; - -======= - for (vtkm::Id i = 0; - i < ResultVec[static_cast(j)].GetField().GetData().GetNumberOfValues(); - i++) - { - VTKM_TEST_ASSERT(MBlockArray.GetPortalConstControl().Get(i) == - SDataSetArray.GetPortalConstControl().Get(i), - "result values incorrect"); - } - } - return; ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d } void TestMultiBlockFilters() { -<<<<<<< HEAD std::size_t BlockNum = 7; -======= - std::size_t BlockNum = 7; ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d + std::vector results; vtkm::cont::MultiBlock Blocks; @@ -208,11 +132,7 @@ void TestMultiBlockFilters() Result_Verify(results, cellAverage, Blocks, std::string("pointvar")); -<<<<<<< HEAD return; -======= - return; ->>>>>>> 1d80d5b69c385b42250a45bb12b33574fc5c764d }