diff --git a/examples/particle_advection/ParticleAdvection.cxx b/examples/particle_advection/ParticleAdvection.cxx index cfbbc2e0d..e2e4a1695 100644 --- a/examples/particle_advection/ParticleAdvection.cxx +++ b/examples/particle_advection/ParticleAdvection.cxx @@ -57,11 +57,11 @@ int main(int argc, char** argv) //create seeds randomly placed withing the bounding box of the data. vtkm::Bounds bounds = ds.GetCoordinateSystem().GetBounds(); - std::vector seeds; + std::vector seeds; for (vtkm::Id i = 0; i < numSeeds; i++) { - vtkm::Massless p; + vtkm::Particle p; vtkm::FloatDefault rx = (vtkm::FloatDefault)rand() / (vtkm::FloatDefault)RAND_MAX; vtkm::FloatDefault ry = (vtkm::FloatDefault)rand() / (vtkm::FloatDefault)RAND_MAX; vtkm::FloatDefault rz = (vtkm::FloatDefault)rand() / (vtkm::FloatDefault)RAND_MAX; diff --git a/examples/streamline_mpi/StreamlineMPI.cxx b/examples/streamline_mpi/StreamlineMPI.cxx index 6476b5a67..51a0c79c9 100644 --- a/examples/streamline_mpi/StreamlineMPI.cxx +++ b/examples/streamline_mpi/StreamlineMPI.cxx @@ -101,11 +101,11 @@ int main(int argc, char** argv) vtkm::filter::ParticleAdvection pa; - vtkm::cont::ArrayHandle seedArray; - std::vector seeds; - seeds.push_back(vtkm::Massless(vtkm::Vec3f(.1f, .1f, .9f), 0)); - seeds.push_back(vtkm::Massless(vtkm::Vec3f(.1f, .6f, .6f), 1)); - seeds.push_back(vtkm::Massless(vtkm::Vec3f(.1f, .9f, .1f), 2)); + vtkm::cont::ArrayHandle seedArray; + std::vector seeds; + seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .1f, .9f), 0)); + seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .6f, .6f), 1)); + seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .9f, .1f), 2)); seedArray = vtkm::cont::make_ArrayHandle(seeds); pa.SetStepSize(0.001f); pa.SetNumberOfSteps(10000); diff --git a/examples/temporal_advection/TemporalAdvection.cxx b/examples/temporal_advection/TemporalAdvection.cxx index 61f2135ba..d4501f475 100644 --- a/examples/temporal_advection/TemporalAdvection.cxx +++ b/examples/temporal_advection/TemporalAdvection.cxx @@ -75,7 +75,7 @@ int main(int argc, char** argv) // Use the coordinate system as seeds for performing advection vtkm::cont::ArrayHandle pts; vtkm::cont::ArrayCopy(ds1.GetCoordinateSystem().GetData(), pts); - vtkm::cont::ArrayHandle seeds; + vtkm::cont::ArrayHandle seeds; vtkm::Id numPts = pts.GetNumberOfValues(); seeds.Allocate(numPts); @@ -83,7 +83,7 @@ int main(int argc, char** argv) auto seedPortal = seeds.WritePortal(); for (vtkm::Id i = 0; i < numPts; i++) { - vtkm::Massless p; + vtkm::Particle p; p.Pos = ptsPortal.Get(i); p.ID = i; seedPortal.Set(i, p);