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

Remove DataSetFieldAdd from examples as well.

Browse Source
This commit is contained in:
NAThompson 2020-05-27 16:26:11 -04:00
parent fe4f71ab92
commit 8fe17e0a65
8 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/contour_tree/ContourTreeMesh2D.cxx
View File

@ -56,7 +56,6 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/filter/ContourTreeUniform.h>
@ -103,8 +102,7 @@ int main(int argc, char* argv[])
vtkm::cont::DataSetBuilderUniform dsb;
vtkm::cont::DataSet inDataSet = dsb.Create(vdims);
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(inDataSet, "values", values);
inDataSet.AddPointField("values", values);
// Convert 2D mesh of values into contour tree, pairs of vertex ids
vtkm::filter::ContourTreeMesh2D filter;

4
examples/contour_tree/ContourTreeMesh3D.cxx
View File

@ -56,7 +56,6 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/filter/ContourTreeUniform.h>
@ -104,8 +103,7 @@ int main(int argc, char* argv[])
vtkm::cont::DataSetBuilderUniform dsb;
vtkm::cont::DataSet inDataSet = dsb.Create(vdims);
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(inDataSet, "values", values);
inDataSet.AddPointField("values", values);
// Convert 3D mesh of values into contour tree, pairs of vertex ids
vtkm::filter::ContourTreeMesh3D filter;

7
examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -64,7 +64,6 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/cont/RuntimeDeviceTracker.h>
#include <vtkm/cont/Timer.h>
@ -528,8 +527,7 @@ int main(int argc, char* argv[])
vdims[2] = static_cast<vtkm::Id>(dims[2]);
inDataSet = dsb.Create(vdims);
}
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(inDataSet, "values", values);
inDataSet.AddPointField("values", values);
}
#else // Create a multi-block dataset for multi-block DIY-paralle processing
vtkm::cont::PartitionedDataSet inDataSet; // Partitioned variant of the input dataset
@ -626,8 +624,7 @@ int main(int argc, char* argv[])
std::vector<vtkm::Float32> subValues((values.begin() + blockStart),
(values.begin() + blockEnd));
vtkm::cont::DataSetFieldAdd dsf;
dsf.AddPointField(ds, "values", subValues);
ds.AddPointField("values", subValues);
inDataSet.AppendPartition(ds);
}
}

3
examples/histogram/Histogram.cxx
View File

@ -18,7 +18,6 @@
#include "HistogramMPI.h"
#include <vtkm/cont/ArrayPortalToIterators.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/EnvironmentTracker.h>
#include <vtkm/cont/Initialize.h>
@ -82,7 +81,7 @@ int main(int argc, char* argv[])
vtkm::cont::PartitionedDataSet pds;
vtkm::cont::DataSet ds;
vtkm::cont::DataSetFieldAdd::AddPointField(ds, "pointvar", CreateArray(-1024, 1024, numVals));
ds.AddPointField("pointvar", CreateArray(-1024, 1024, numVals));
pds.AppendPartition(ds);
example::HistogramMPI histogram;

4
examples/lagrangian/lagrangian.cxx
View File

@ -16,7 +16,6 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderRectilinear.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/filter/Lagrangian.h>
@ -48,7 +47,6 @@ vtkm::cont::DataSet make3DRectilinearDataSet(double time)
vtkm::Vec3f_64 SPACING(xdiff, ydiff, zdiff);
vtkm::cont::DataSet dataset = dsb.Create(DIMS, ORIGIN, SPACING);
vtkm::cont::DataSetFieldAdd dsf;
int numPoints = dims[0] * dims[1] * dims[2];
@ -70,7 +68,7 @@ vtkm::cont::DataSet make3DRectilinearDataSet(double time)
}
}
}
dsf.AddPointField(dataset, "velocity", velocityField);
dataset.AddPointField("velocity", velocityField);
return dataset;
}

1
examples/lagrangian_structures/LagrangianStructures.cxx
View File

@ -17,7 +17,6 @@
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/io/VTKDataSetReader.h>

4
examples/multi_backend/IOGenerator.cxx
View File

@ -12,7 +12,6 @@
#include <vtkm/Math.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Invoker.h>
#include <vtkm/worklet/WorkletMapField.h>
@ -39,14 +38,13 @@ struct WaveField : public vtkm::worklet::WorkletMapField
vtkm::cont::DataSet make_test3DImageData(vtkm::Id3 dims)
{
using Builder = vtkm::cont::DataSetBuilderUniform;
using FieldAdd = vtkm::cont::DataSetFieldAdd;
vtkm::cont::DataSet ds = Builder::Create(dims);
vtkm::cont::ArrayHandle<vtkm::Vec3f> field;
vtkm::cont::Invoker invoke;
invoke(WaveField{}, ds.GetCoordinateSystem(), field);
FieldAdd::AddPointField(ds, "vec_field", field);
ds.AddPointField("vec_field", field);
return ds;
}

4
examples/polyline_archimedean_helix/PolyLineArchimedeanHelix.cxx
View File

@ -16,7 +16,6 @@
#include <vtkm/cont/ColorTable.h>
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/rendering/Camera.h>
#include <vtkm/rendering/CanvasRayTracer.h>
#include <vtkm/rendering/MapperRayTracer.h>
@ -100,7 +99,6 @@ void TubeThatSpiral(vtkm::FloatDefault radius, vtkm::Id numLineSegments, vtkm::I
vtkm::rendering::Color bg(0.2f, 0.2f, 0.2f, 1.0f);
vtkm::cont::DataSetFieldAdd dsfa;
std::vector<vtkm::FloatDefault> v(static_cast<std::size_t>(tubePoints.GetNumberOfValues()));
// The first value is a cap:
v[0] = 0;
@ -116,7 +114,7 @@ void TubeThatSpiral(vtkm::FloatDefault radius, vtkm::Id numLineSegments, vtkm::I
// Point at the end cap should be the same color as the surroundings:
v[v.size() - 1] = v[v.size() - 2];
dsfa.AddPointField(tubeDataset, "Spiral Radius", v);
tubeDataset.AddPointField("Spiral Radius", v);
scene.AddActor(vtkm::rendering::Actor(tubeDataset.GetCellSet(),
tubeDataset.GetCoordinateSystem(),
tubeDataset.GetField("Spiral Radius"),