Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing issues after rebasing

Browse Source
This commit is contained in:
Abhishek Yenpure 2023-06-23 17:08:07 -07:00
parent 0b76f44c8d
commit e6545f0ca4
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/flow/FilterParticleAdvectionSteadyState.h
View File

@ -83,7 +83,7 @@ private:
}
vtkm::filter::flow::internal::ParticleAdvector<DSIType> pav(
boundsMap, dsi, this->UseThreadedAlgorithm);
boundsMap, dsi, this->UseThreadedAlgorithm, this->UseAsynchronousCommunication);
vtkm::cont::ArrayHandle<ParticleType> particles;
this->Seeds.AsArrayHandle(particles);

2
vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h
View File

@ -102,7 +102,7 @@ private:
analysis);
}
vtkm::filter::flow::internal::ParticleAdvector<DSIType> pav(
boundsMap, dsi, this->UseThreadedAlgorithm);
boundsMap, dsi, this->UseThreadedAlgorithm, this->UseAsynchronousCommunication);
vtkm::cont::ArrayHandle<ParticleType> particles;
this->Seeds.AsArrayHandle(particles);

2
vtkm/filter/flow/internal/AdvectAlgorithmThreaded.h
View File

@ -37,7 +37,7 @@ public:
AdvectAlgorithmThreaded(const vtkm::filter::flow::internal::BoundsMap& bm,
std::vector<DSIType>& blocks,
bool useAsyncComm)
: AdvectAlgorithm<DSIType>(bm, blocks)
: AdvectAlgorithm<DSIType>(bm, blocks, useAsyncComm)
, Done(false)
, WorkerActivate(false)
{

2
vtkm/filter/flow/internal/DataSetIntegratorSteadyState.h
View File

@ -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<ParticleType, FieldType, TerminationType, AnalysisType>;

2
vtkm/filter/flow/internal/DataSetIntegratorUnsteadyState.h
View File

@ -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<ParticleType, FieldType, TerminationType, AnalysisType>;

8
vtkm/filter/flow/internal/ParticleAdvector.h
View File

@ -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<ParticleType>& 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<DSIType> Blocks;
vtkm::filter::flow::internal::BoundsMap BoundsMap;
bool UseThreadedAlgorithm;
bool UseAsynchronousCommunication = true;
};
}