diff --git a/examples/contour_tree_distributed/ContourTreeApp.cxx b/examples/contour_tree_distributed/ContourTreeApp.cxx index 6b9faff0f..7408acf26 100644 --- a/examples/contour_tree_distributed/ContourTreeApp.cxx +++ b/examples/contour_tree_distributed/ContourTreeApp.cxx @@ -705,8 +705,7 @@ int main(int argc, char* argv[]) auto tempFieldData = inDataSet.GetField(0).GetData(); values.resize(static_cast(tempFieldData.GetNumberOfValues())); auto valuesHandle = vtkm::cont::make_ArrayHandle(values, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy( - tempFieldData.ResetTypes, VTKM_DEFAULT_STORAGE_LIST>(), valuesHandle); + vtkm::cont::ArrayCopy(tempFieldData, valuesHandle); valuesHandle.SyncControlArray(); //Forces values to get updated if copy happened on GPU } // Read ASCII data input diff --git a/vtkm/filter/ContourTreeUniformAugmented.hxx b/vtkm/filter/ContourTreeUniformAugmented.hxx index 65249640d..6ed0ce2af 100644 --- a/vtkm/filter/ContourTreeUniformAugmented.hxx +++ b/vtkm/filter/ContourTreeUniformAugmented.hxx @@ -299,9 +299,7 @@ VTKM_CONT void ContourTreeAugmented::DoPostExecute( currBlock.GetField(this->GetActiveFieldName(), this->GetActiveFieldAssociation()); //const vtkm::cont::ArrayHandle &fieldData = currField.GetData().Cast >(); vtkm::cont::ArrayHandle fieldData; - vtkm::cont::ArrayCopy( - currField.GetData().template ResetTypes, VTKM_DEFAULT_STORAGE_LIST>(), - fieldData); + vtkm::cont::ArrayCopy(currField.GetData(), fieldData); auto currContourTreeMesh = vtkm::worklet::contourtree_distributed::MultiBlockContourTreeHelper:: ComputeLocalContourTreeMesh( this->MultiBlockTreeHelper->MultiBlockSpatialDecomposition.LocalBlockOrigins.ReadPortal() diff --git a/vtkm/filter/ContourTreeUniformDistributed.hxx b/vtkm/filter/ContourTreeUniformDistributed.hxx index 7f0e90896..946b904ac 100644 --- a/vtkm/filter/ContourTreeUniformDistributed.hxx +++ b/vtkm/filter/ContourTreeUniformDistributed.hxx @@ -680,9 +680,7 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute( auto currField = currBlock.GetField(this->GetActiveFieldName(), this->GetActiveFieldAssociation()); vtkm::cont::ArrayHandle fieldData; - vtkm::cont::ArrayCopy( - currField.GetData().ResetTypes(vtkm::List{}, VTKM_DEFAULT_STORAGE_LIST{}), - fieldData); + vtkm::cont::ArrayCopy(currField.GetData(), fieldData); // ... compute and store the actual mesh localDataBlocks[bi]->ContourTreeMeshes.emplace_back(this->LocalBoundaryTrees[bi].VertexIndex, @@ -916,9 +914,7 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute( auto currField = currBlock.GetField(this->GetActiveFieldName(), this->GetActiveFieldAssociation()); vtkm::cont::ArrayHandle fieldData; - vtkm::cont::ArrayCopy( - currField.GetData().ResetTypes(vtkm::List{}, VTKM_DEFAULT_STORAGE_LIST{}), - fieldData); + vtkm::cont::ArrayCopy(currField.GetData(), fieldData); auto localToGlobalIdRelabeler = vtkm::worklet::contourtree_augmented::mesh_dem::IdRelabeler( this->MultiBlockSpatialDecomposition.LocalBlockOrigins.ReadPortal().Get( blockData->BlockIndex), diff --git a/vtkm/filter/particleadvection/DataSetIntegrator.h b/vtkm/filter/particleadvection/DataSetIntegrator.h index f54a43c15..18cc533ca 100644 --- a/vtkm/filter/particleadvection/DataSetIntegrator.h +++ b/vtkm/filter/particleadvection/DataSetIntegrator.h @@ -46,8 +46,7 @@ public: if (fieldData.IsType()) fieldArray = fieldData.AsArrayHandle(); else - vtkm::cont::ArrayCopy( - fieldData.ResetTypes(), fieldArray); + vtkm::cont::ArrayCopy(fieldData, fieldArray); this->Eval = std::shared_ptr(new GridEvalType(ds, fieldArray)); } diff --git a/vtkm/worklet/contourtree_distributed/TreeCompiler.h b/vtkm/worklet/contourtree_distributed/TreeCompiler.h index 9ea9b840c..1704c2e24 100644 --- a/vtkm/worklet/contourtree_distributed/TreeCompiler.h +++ b/vtkm/worklet/contourtree_distributed/TreeCompiler.h @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -222,42 +223,36 @@ inline std::istream& operator>>(std::istream& inStream, SupernodeOnSuperarc& nod inline void TreeCompiler::AddHierarchicalTree(const vtkm::cont::DataSet& addedTree) { // TreeCompiler::AddHierarchicalTree() // Copy relevant tree content to STL arrays - vtkm::cont::VariantArrayHandle dataValues_array = addedTree.GetField("DataValues").GetData(); + vtkm::cont::UnknownArrayHandle dataValues_array = addedTree.GetField("DataValues").GetData(); std::vector dataValues(dataValues_array.GetNumberOfValues()); auto dataValues_handle = vtkm::cont::make_ArrayHandle(dataValues, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy(dataValues_array.ResetTypes(vtkm::TypeListScalarAll{}), dataValues_handle); + vtkm::cont::ArrayCopy(dataValues_array, dataValues_handle); dataValues_handle.SyncControlArray(); auto regularNodeGlobalIds_array = addedTree.GetField("RegularNodeGlobalIds").GetData(); std::vector regularNodeGlobalIds(regularNodeGlobalIds_array.GetNumberOfValues()); auto regularNodeGlobalIds_handle = vtkm::cont::make_ArrayHandle(regularNodeGlobalIds, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy( - regularNodeGlobalIds_array.ResetTypes(), - regularNodeGlobalIds_handle); + vtkm::cont::ArrayCopy(regularNodeGlobalIds_array, regularNodeGlobalIds_handle); regularNodeGlobalIds_handle .SyncControlArray(); //Forces values to get updated if copy happened on GPU auto superarcs_array = addedTree.GetField("Superarcs").GetData(); std::vector added_tree_superarcs(superarcs_array.GetNumberOfValues()); auto superarcs_handle = vtkm::cont::make_ArrayHandle(added_tree_superarcs, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy(superarcs_array.ResetTypes(), - superarcs_handle); + vtkm::cont::ArrayCopy(superarcs_array, superarcs_handle); superarcs_handle.SyncControlArray(); //Forces values to get updated if copy happened on GPU auto supernodes_array = addedTree.GetField("Supernodes").GetData(); std::vector added_tree_supernodes(supernodes_array.GetNumberOfValues()); auto supernodes_handle = vtkm::cont::make_ArrayHandle(added_tree_supernodes, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy(supernodes_array.ResetTypes(), - supernodes_handle); + vtkm::cont::ArrayCopy(supernodes_array, supernodes_handle); supernodes_handle.SyncControlArray(); //Forces values to get updated if copy happened on GPU auto superparents_array = addedTree.GetField("Superparents").GetData(); std::vector superparents(superparents_array.GetNumberOfValues()); auto superparents_handle = vtkm::cont::make_ArrayHandle(superparents, vtkm::CopyFlag::Off); - vtkm::cont::ArrayCopy( - superparents_array.ResetTypes(), - superparents_handle); + vtkm::cont::ArrayCopy(superparents_array, superparents_handle); superparents_handle.SyncControlArray(); //Forces values to get updated if copy happened on GPU // loop through all of the supernodes in the hierarchical tree diff --git a/vtkm/worklet/testing/UnitTestParticleAdvection.cxx b/vtkm/worklet/testing/UnitTestParticleAdvection.cxx index 2a911ef9b..ffc97acc1 100644 --- a/vtkm/worklet/testing/UnitTestParticleAdvection.cxx +++ b/vtkm/worklet/testing/UnitTestParticleAdvection.cxx @@ -838,8 +838,7 @@ void TestParticleAdvectionFile(const std::string& fname, if (fieldData.IsType()) fieldArray = fieldData.AsArrayHandle(); else - vtkm::cont::ArrayCopy( - fieldData.ResetTypes(), fieldArray); + vtkm::cont::ArrayCopy(fieldData, fieldArray); FieldType velocities(fieldArray); GridEvalType eval(ds.GetCoordinateSystem(), ds.GetCellSet(), velocities);