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

Merge topic 'lagrangian_bugfix'

Browse Source 
10dc96cb8 Remove extra count variable
536249f63 Merge remote-tracking branch 'upstream/master' into lagrangian_bugfix
519844782 Fix order of initialized seeds to match output format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2084
This commit is contained in:
Matt Larsen 2020-05-20 20:07:47 +00:00 committed by Kitware Robot
commit 1cc38e5e8d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtkm/filter/Lagrangian.hxx
View File

@ -183,23 +183,22 @@ inline void Lagrangian::InitializeSeedPositions(const vtkm::cont::DataSet& input
auto portal1 = BasisParticles.WritePortal();
auto portal2 = BasisParticlesValidity.WritePortal();
vtkm::Id count = 0, id = 0;
for (int x = 0; x < this->SeedRes[0]; x++)
vtkm::Id id = 0;
for (int z = 0; z < this->SeedRes[2]; z++)
{
vtkm::FloatDefault xi = static_cast<vtkm::FloatDefault>(x * x_spacing);
vtkm::FloatDefault zi = static_cast<vtkm::FloatDefault>(z * z_spacing);
for (int y = 0; y < this->SeedRes[1]; y++)
{
vtkm::FloatDefault yi = static_cast<vtkm::FloatDefault>(y * y_spacing);
for (int z = 0; z < this->SeedRes[2]; z++)
for (int x = 0; x < this->SeedRes[0]; x++)
{
vtkm::FloatDefault zi = static_cast<vtkm::FloatDefault>(z * z_spacing);
portal1.Set(count,
vtkm::FloatDefault xi = static_cast<vtkm::FloatDefault>(x * x_spacing);
portal1.Set(id,
vtkm::Particle(Vec3f(static_cast<vtkm::FloatDefault>(bounds.X.Min) + xi,
static_cast<vtkm::FloatDefault>(bounds.Y.Min) + yi,
static_cast<vtkm::FloatDefault>(bounds.Z.Min) + zi),
id));
portal2.Set(count, 1);
count++;
portal2.Set(id, 1);
id++;
}
}