Commit 697369fc authored by Nick Thompson's avatar Nick Thompson
Browse files

Remove deprecation warnings throughout the project.

parent d610176a
......@@ -157,7 +157,7 @@ Marching Cubes algorithm on it, and render the results to an image:
#include <vtkm/Range.h>
#include <vtkm/cont/ColorTable.h>
#include <vtkm/filter/Contour.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/rendering/Actor.h>
#include <vtkm/rendering/Camera.h>
#include <vtkm/rendering/CanvasRayTracer.h>
......@@ -166,7 +166,7 @@ Marching Cubes algorithm on it, and render the results to an image:
#include <vtkm/rendering/Scene.h>
#include <vtkm/rendering/View3D.h>
vtkm::io::reader::VTKDataSetReader reader("path/to/vtk_image_file");
vtkm::io::VTKDataSetReader reader("path/to/vtk_image_file.vtk");
vtkm::cont::DataSet inputData = reader.ReadDataSet();
std::string fieldName = "scalars";
......
......@@ -44,7 +44,7 @@
#include <vtkm/filter/WarpScalar.h>
#include <vtkm/filter/WarpVector.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/source/Wavelet.h>
#include <vtkm/worklet/DispatcherMapField.h>
......@@ -1005,7 +1005,7 @@ void InitDataSet(int& argc, char** argv)
if (!filename.empty())
{
std::cerr << "[InitDataSet] Loading file: " << filename << "\n";
vtkm::io::reader::VTKDataSetReader reader(filename);
vtkm::io::VTKDataSetReader reader(filename);
InputDataSet = reader.ReadDataSet();
}
else
......
......@@ -11,7 +11,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/filter/ClipWithField.h>
......@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
clipFilter.SetClipValue(20.0);
vtkm::cont::DataSet output = clipFilter.Execute(input);
vtkm::io::writer::VTKDataSetWriter writer("out_data.vtk");
vtkm::io::VTKDataSetWriter writer("out_data.vtk");
writer.WriteDataSet(output);
return 0;
......
......@@ -11,8 +11,8 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/worklet/CosmoTools.h>
......
......@@ -11,8 +11,8 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/worklet/CosmoTools.h>
......
......@@ -13,7 +13,7 @@
#include <vtkm/filter/CreateResult.h>
#include <vtkm/filter/FilterField.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/cont/Initialize.h>
......@@ -90,7 +90,7 @@ int main(int argc, char** argv)
helloField.SetActiveField("point_vectors");
vtkm::cont::DataSet outputData = helloField.Execute(inputData);
vtkm::io::writer::VTKDataSetWriter writer("out_data.vtk");
vtkm::io::VTKDataSetWriter writer("out_data.vtk");
writer.WriteDataSet(outputData);
return 0;
......
......@@ -20,8 +20,8 @@
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/filter/LagrangianStructures.h>
......@@ -38,7 +38,7 @@ int main(int argc, char** argv)
std::cout << "Reading input dataset" << std::endl;
vtkm::cont::DataSet input;
vtkm::io::reader::VTKDataSetReader reader(datasetName);
vtkm::io::VTKDataSetReader reader(datasetName);
input = reader.ReadDataSet();
std::cout << "Read input dataset" << std::endl;
......@@ -50,7 +50,7 @@ int main(int argc, char** argv)
lcsFilter.SetActiveField(variableName);
vtkm::cont::DataSet output = lcsFilter.Execute(input);
vtkm::io::writer::VTKDataSetWriter writer("out.vtk");
vtkm::io::VTKDataSetWriter writer("out.vtk");
writer.WriteDataSet(output);
std::cout << "Written output dataset" << std::endl;
......
......@@ -24,8 +24,8 @@
#include <vtkm/cont/DataSetBuilderExplicit.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/MeshQuality.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
/**
......@@ -206,7 +206,7 @@ int TestMetrics(const char* outFileName,
vtkm::cont::DataSet outputData;
try
{
vtkm::io::writer::VTKDataSetWriter writer("testZoo_withPolygons.vtk");
vtkm::io::VTKDataSetWriter writer("testZoo_withPolygons.vtk");
writer.WriteDataSet(data);
outputData = filter.Execute(data);
......@@ -220,7 +220,7 @@ int TestMetrics(const char* outFileName,
}
try
{
vtkm::io::writer::VTKDataSetWriter writer(outFileName);
vtkm::io::VTKDataSetWriter writer(outFileName);
writer.WriteDataSet(outputData);
std::cout << "finished writing data\n";
}
......@@ -253,7 +253,7 @@ int main(int argc, char* argv[])
break;
}
vtkm::cont::DataSet input;
vtkm::io::reader::VTKDataSetReader reader(argv[1]);
vtkm::io::VTKDataSetReader reader(argv[1]);
// A cell metric is now computed for every shape type that exists in the
......
......@@ -11,8 +11,8 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/filter/Streamline.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
// Example computing streamlines.
// An example vector field is available in the vtk-m data directory: magField.vtk
......@@ -46,7 +46,7 @@ int main(int argc, char** argv)
if (dataFile.find(".vtk") != std::string::npos)
{
vtkm::io::reader::VTKDataSetReader rdr(dataFile);
vtkm::io::VTKDataSetReader rdr(dataFile);
ds = rdr.ReadDataSet();
}
else
......@@ -83,7 +83,7 @@ int main(int argc, char** argv)
streamline.SetActiveField(varName);
auto output = streamline.Execute(ds);
vtkm::io::writer::VTKDataSetWriter wrt(outputFile);
vtkm::io::VTKDataSetWriter wrt(outputFile);
wrt.WriteDataSet(output);
return 0;
......
......@@ -11,7 +11,7 @@
#include <complex>
#include <vtkm/cont/DataSetBuilderExplicit.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/worklet/Tube.h>
#include <vtkm/cont/ColorTable.h>
......
......@@ -12,8 +12,8 @@
#include <vtkm/cont/EnvironmentTracker.h>
#include <vtkm/cont/Initialize.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/thirdparty/diy/diy.h>
......@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
vtkm::cont::DataSet input;
if (comm.rank() == 0)
{
vtkm::io::reader::VTKDataSetReader reader(argv[1]);
vtkm::io::VTKDataSetReader reader(argv[1]);
input = reader.ReadDataSet();
}
......@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
std::ostringstream str;
str << argv[2] << "-" << comm.rank() << ".vtk";
vtkm::io::writer::VTKDataSetWriter writer(str.str());
vtkm::io::VTKDataSetWriter writer(str.str());
writer.WriteDataSet(output);
return EXIT_SUCCESS;
}
......@@ -18,8 +18,8 @@
#include <vtkm/filter/Pathline.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetWriter.h>
int main(int argc, char** argv)
{
......@@ -63,10 +63,10 @@ int main(int argc, char** argv)
stepSize = static_cast<vtkm::Float32>(atof(argv[7]));
outputName = std::string(argv[8]);
vtkm::io::reader::VTKDataSetReader reader1(datasetName1);
vtkm::io::VTKDataSetReader reader1(datasetName1);
vtkm::cont::DataSet ds1 = reader1.ReadDataSet();
vtkm::io::reader::VTKDataSetReader reader2(datasetName2);
vtkm::io::VTKDataSetReader reader2(datasetName2);
vtkm::cont::DataSet ds2 = reader2.ReadDataSet();
// Use the coordinate system as seeds for performing advection
......@@ -109,7 +109,7 @@ int main(int argc, char** argv)
// The way to verify if the code produces correct streamlines
// is to do a visual test by using VisIt/ParaView to visualize
// the file written by this method.
vtkm::io::writer::VTKDataSetWriter writer(outputName);
vtkm::io::VTKDataSetWriter writer(outputName);
writer.WriteDataSet(output);
return 0;
}
......@@ -11,7 +11,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/filter/Tetrahedralize.h>
......@@ -25,7 +25,7 @@ int main(int argc, char* argv[])
vtkm::filter::Tetrahedralize tetrahedralizeFilter;
vtkm::cont::DataSet output = tetrahedralizeFilter.Execute(input);
vtkm::io::writer::VTKDataSetWriter writer("out_tets.vtk");
vtkm::io::VTKDataSetWriter writer("out_tets.vtk");
writer.WriteDataSet(output);
return 0;
......
......@@ -11,7 +11,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/io/VTKDataSetWriter.h>
#include <vtkm/filter/Triangulate.h>
......@@ -24,7 +24,7 @@ int main(int argc, char* argv[])
vtkm::filter::Triangulate triangulateFilter;
vtkm::cont::DataSet output = triangulateFilter.Execute(input);
vtkm::io::writer::VTKDataSetWriter writer("out_tris.vtk");
vtkm::io::VTKDataSetWriter writer("out_tris.vtk");
writer.WriteDataSet(output);
return 0;
......
......@@ -27,7 +27,7 @@
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/MeshQuality.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
//Adapted from vtkm/cont/testing/MakeTestDataSet.h
//Modified the content of the MakeExplicitDataSetZoo() function
......
......@@ -20,7 +20,7 @@ namespace io
namespace reader
{
class VTKM_DEPRECATED(1.6, "Please use vtkm::io::BOVDataSetReader") BOVDataSetReader
class VTKM_DEPRECATED(1.6, "Please use vtkm::io::BOVDataSetReader.") BOVDataSetReader
: public io::BOVDataSetReader
{
public:
......
......@@ -20,7 +20,7 @@ namespace io
namespace reader
{
class VTKM_DEPRECATED(1.6, "Please use vtkm::io::VTKDataSetReader") VTKDataSetReader
class VTKM_DEPRECATED(1.6, "Please use vtkm::io::VTKDataSetReader.") VTKDataSetReader
: public io::VTKDataSetReader
{
public:
......
......@@ -9,7 +9,7 @@
//============================================================================
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <string>
......@@ -401,7 +401,7 @@ inline void createFile(const char* buffer, std::size_t size, const char* fname)
inline vtkm::cont::DataSet readVTKDataSet(const char* fname)
{
vtkm::cont::DataSet ds;
vtkm::io::reader::VTKDataSetReader reader(fname);
vtkm::io::VTKDataSetReader reader(fname);
try
{
ds = reader.ReadDataSet();
......
......@@ -11,7 +11,7 @@
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/rendering/Actor.h>
#include <vtkm/rendering/Canvas.h>
#include <vtkm/rendering/CanvasRayTracer.h>
......@@ -38,7 +38,7 @@ void RenderTests()
vtkm::cont::DataSet rectDS, unsDS;
std::string basePath = vtkm::cont::testing::Testing::GetTestDataBasePath();
std::string rectfname = basePath + "/rectilinear/noise.vtk";
vtkm::io::reader::VTKDataSetReader rectReader(rectfname);
vtkm::io::VTKDataSetReader rectReader(rectfname);
try
{
......
......@@ -17,7 +17,7 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/exec/CellInterpolate.h>
#include <vtkm/exec/ParametricCoordinates.h>
#include <vtkm/io/reader/VTKDataSetReader.h>
#include <vtkm/io/VTKDataSetReader.h>
namespace
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment