Skip to content
Snippets Groups Projects
Commit 5bc33750 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/remove_warnings' into 'master'

remove some unused_variable and integer comparison warnings

See merge request spraetor/dune-vtk!30
parents fa603413 a04d7d9f
No related branches found
No related tags found
No related merge requests found
......@@ -117,7 +117,7 @@ namespace Dune
if (!cellType.noPermutation()) {
// apply index permutation
std::vector<unsigned int> cell(element.size());
for (int j = 0; j < element.size(); ++j)
for (std::size_t j = 0; j < element.size(); ++j)
cell[j] = element[cellType.permutation(j)];
std::swap(element, cell);
}
......
......@@ -397,12 +397,6 @@ VtkReader<Grid,Creator>::readCells (std::ifstream& input, std::string name)
sec = readDataArray(input, vec_offsets, numberOfCells_, CELLS_DATA_ARRAY, CELLS);
assert(vec_offsets.size() == numberOfCells_);
} else if (name == "connectivity") {
std::size_t max_size = 0;
int max_vertices = (Grid::dimension == 1 ? 2 : Grid::dimension == 2 ? 4 : 8);
if (!vec_offsets.empty())
max_size = vec_offsets.back();
else
max_size = numberOfCells_ * max_vertices;
sec = readDataArray(input, vec_connectivity, std::size_t(-1), CELLS_DATA_ARRAY, CELLS);
} else if (name == "global_point_ids") {
sec = readDataArray(input, vec_point_ids, numberOfPoints_, CELLS_DATA_ARRAY, CELLS);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment