diff --git a/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h index 91d66a5df..29d8b7cb9 100644 --- a/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h +++ b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h @@ -83,7 +83,7 @@ private: } vtkm::filter::flow::internal::ParticleAdvector pav( - boundsMap, dsi, this->UseThreadedAlgorithm); + boundsMap, dsi, this->UseThreadedAlgorithm, this->UseAsynchronousCommunication); vtkm::cont::ArrayHandle particles; this->Seeds.AsArrayHandle(particles); diff --git a/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h index 31d032a59..83a2a0619 100644 --- a/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h +++ b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h @@ -102,7 +102,7 @@ private: analysis); } vtkm::filter::flow::internal::ParticleAdvector pav( - boundsMap, dsi, this->UseThreadedAlgorithm); + boundsMap, dsi, this->UseThreadedAlgorithm, this->UseAsynchronousCommunication); vtkm::cont::ArrayHandle particles; this->Seeds.AsArrayHandle(particles); diff --git a/vtkm/filter/flow/internal/AdvectAlgorithmThreaded.h b/vtkm/filter/flow/internal/AdvectAlgorithmThreaded.h index 401503231..db4e651fb 100644 --- a/vtkm/filter/flow/internal/AdvectAlgorithmThreaded.h +++ b/vtkm/filter/flow/internal/AdvectAlgorithmThreaded.h @@ -37,7 +37,7 @@ public: AdvectAlgorithmThreaded(const vtkm::filter::flow::internal::BoundsMap& bm, std::vector& blocks, bool useAsyncComm) - : AdvectAlgorithm(bm, blocks) + : AdvectAlgorithm(bm, blocks, useAsyncComm) , Done(false) , WorkerActivate(false) { diff --git a/vtkm/filter/flow/internal/DataSetIntegratorSteadyState.h b/vtkm/filter/flow/internal/DataSetIntegratorSteadyState.h index 0c2200d72..7739b4afd 100644 --- a/vtkm/filter/flow/internal/DataSetIntegratorSteadyState.h +++ b/vtkm/filter/flow/internal/DataSetIntegratorSteadyState.h @@ -111,7 +111,7 @@ public: vtkm::FloatDefault stepSize) { auto copyFlag = (this->CopySeedArray ? vtkm::CopyFlag::On : vtkm::CopyFlag::Off); - auto seedArray = vtkm::cont::make_ArrayHandle(block.V, copyFlag); + auto seedArray = vtkm::cont::make_ArrayHandle(block.Particles, copyFlag); using AdvectionHelper = detail::AdvectHelperSteadyState; diff --git a/vtkm/filter/flow/internal/DataSetIntegratorUnsteadyState.h b/vtkm/filter/flow/internal/DataSetIntegratorUnsteadyState.h index f816bb7ef..366766bd7 100644 --- a/vtkm/filter/flow/internal/DataSetIntegratorUnsteadyState.h +++ b/vtkm/filter/flow/internal/DataSetIntegratorUnsteadyState.h @@ -128,7 +128,7 @@ public: vtkm::FloatDefault stepSize) { auto copyFlag = (this->CopySeedArray ? vtkm::CopyFlag::On : vtkm::CopyFlag::Off); - auto seedArray = vtkm::cont::make_ArrayHandle(block.V, copyFlag); + auto seedArray = vtkm::cont::make_ArrayHandle(block.Particles, copyFlag); using AdvectionHelper = detail::AdvectHelperUnsteadyState; diff --git a/vtkm/filter/flow/internal/ParticleAdvector.h b/vtkm/filter/flow/internal/ParticleAdvector.h index 53aa1f1ef..440941175 100644 --- a/vtkm/filter/flow/internal/ParticleAdvector.h +++ b/vtkm/filter/flow/internal/ParticleAdvector.h @@ -37,8 +37,8 @@ public: const bool& useAsyncComm) : Blocks(blocks) , BoundsMap(bm) - , UseAsynchronousCommunication(useAsyncComm) , UseThreadedAlgorithm(useThreaded) + , UseAsynchronousCommunication(useAsyncComm) { } @@ -62,15 +62,15 @@ private: vtkm::cont::PartitionedDataSet RunAlgo(const vtkm::cont::ArrayHandle& seeds, vtkm::FloatDefault stepSize) { - AlgorithmType algo(this->BoundsMap, this->Blocks); + AlgorithmType algo(this->BoundsMap, this->Blocks, this->UseAsynchronousCommunication); algo.Execute(seeds, stepSize); return algo.GetOutput(); } - vtkm::filter::flow::internal::BoundsMap BoundsMap; - bool UseAsynchronousCommunication = true; std::vector Blocks; + vtkm::filter::flow::internal::BoundsMap BoundsMap; bool UseThreadedAlgorithm; + bool UseAsynchronousCommunication = true; }; }