Commit 611618c4 authored by dpugmire's avatar dpugmire
Browse files

compiler warnings.

parent 64b52248
...@@ -116,8 +116,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -116,8 +116,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef vtkm::Vec<vtkm::Float32,3> CoordType; typedef vtkm::Vec<vtkm::Float32,3> CoordType;
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); for (size_t i=0; i < coords.size(); i++)
for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -176,7 +175,6 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords, ...@@ -176,7 +175,6 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords,
{ {
vtkm::cont::DataSet dataSet; vtkm::cont::DataSet dataSet;
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
vtkm::cont::ArrayHandle<Vec<T,3> > coordsArray; vtkm::cont::ArrayHandle<Vec<T,3> > coordsArray;
DFA::Copy(vtkm::cont::make_ArrayHandle(coords), coordsArray); DFA::Copy(vtkm::cont::make_ArrayHandle(coords), coordsArray);
...@@ -208,8 +206,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -208,8 +206,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef vtkm::Vec<vtkm::Float32,3> CoordType; typedef vtkm::Vec<vtkm::Float32,3> CoordType;
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); for (size_t i=0; i < xVals.size(); i++)
for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -218,6 +215,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -218,6 +215,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
dataSet.AddCoordinateSystem( dataSet.AddCoordinateSystem(
vtkm::cont::CoordinateSystem(coordsNm, 1, coords)); vtkm::cont::CoordinateSystem(coordsNm, 1, coords));
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2); vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2);
cellSet.FillViaCopy(shapes, numIndices, connectivity); cellSet.FillViaCopy(shapes, numIndices, connectivity);
dataSet.AddCellSet(cellSet); dataSet.AddCellSet(cellSet);
...@@ -245,8 +243,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -245,8 +243,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
typedef vtkm::Vec<vtkm::Float32,3> CoordType; typedef vtkm::Vec<vtkm::Float32,3> CoordType;
std::vector<CoordType> coords(xVals.size()); std::vector<CoordType> coords(xVals.size());
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size()); for (size_t i=0; i < coords.size(); i++)
for (vtkm::Id i=0; i < nPts; i++)
{ {
coords[i][0] = xVals[i]; coords[i][0] = xVals[i];
coords[i][1] = yVals[i]; coords[i][1] = yVals[i];
...@@ -255,6 +252,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals, ...@@ -255,6 +252,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
dataSet.AddCoordinateSystem( dataSet.AddCoordinateSystem(
vtkm::cont::CoordinateSystem(coordsNm, 1, coords)); vtkm::cont::CoordinateSystem(coordsNm, 1, coords));
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2); vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2);
cellSet.FillViaCopy(shapes, numIndices, connectivity); cellSet.FillViaCopy(shapes, numIndices, connectivity);
dataSet.AddCellSet(cellSet); dataSet.AddCellSet(cellSet);
...@@ -273,13 +271,13 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords, ...@@ -273,13 +271,13 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords,
{ {
vtkm::cont::DataSet dataSet; vtkm::cont::DataSet dataSet;
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
vtkm::cont::ArrayHandle<Vec<T,3> > coordsArray; vtkm::cont::ArrayHandle<Vec<T,3> > coordsArray;
DFA::Copy(vtkm::cont::make_ArrayHandle(coords), coordsArray); DFA::Copy(vtkm::cont::make_ArrayHandle(coords), coordsArray);
dataSet.AddCoordinateSystem( dataSet.AddCoordinateSystem(
vtkm::cont::CoordinateSystem(coordsNm, 1, coordsArray)); vtkm::cont::CoordinateSystem(coordsNm, 1, coordsArray));
vtkm::Id nPts = static_cast<vtkm::Id>(coords.size());
vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2); vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, 2);
cellSet.FillViaCopy(shapes, numIndices, connectivity); cellSet.FillViaCopy(shapes, numIndices, connectivity);
dataSet.AddCellSet(cellSet); dataSet.AddCellSet(cellSet);
......
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