From: Martin Kronbichler Date: Sat, 11 Apr 2015 20:17:14 +0000 (+0200) Subject: Fix SparsityTools::reorder_hierarchical with 64 bit integers X-Git-Tag: v8.3.0-rc1~293^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F776%2Fhead;p=dealii.git Fix SparsityTools::reorder_hierarchical with 64 bit integers --- diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc index 905edda0c5..a9e3432779 100644 --- a/source/lac/sparsity_tools.cc +++ b/source/lac/sparsity_tools.cc @@ -371,12 +371,12 @@ namespace SparsityTools // Find cell with the minimal number of neighbors (typically a corner // node when based on FEM meshes). If no cell is left, we are done. std::pair min_neighbors - (numbers::invalid_unsigned_int, numbers::invalid_unsigned_int); + (numbers::invalid_dof_index, numbers::invalid_dof_index); for (types::global_dof_index i=0; i::iterator it=current_neighbors.begin(); it != current_neighbors.end(); ++it) { - AssertThrow(touched_nodes[*it] == numbers::invalid_unsigned_int, + AssertThrow(touched_nodes[*it] == numbers::invalid_dof_index, ExcInternalError()); types::global_dof_index active_row_length = 0; for (CompressedSimpleSparsityPattern::row_iterator rowit = connectivity.row_begin(*it); rowit != connectivity.row_end(*it); ++rowit) - if (touched_nodes[*rowit] == numbers::invalid_unsigned_int) + if (touched_nodes[*rowit] == numbers::invalid_dof_index) ++active_row_length; if (active_row_length < min_neighbors.second) min_neighbors = std::make_pair(*it, active_row_length); @@ -412,7 +412,7 @@ namespace SparsityTools for (CompressedSimpleSparsityPattern::row_iterator rowit = connectivity.row_begin(*it); rowit != connectivity.row_end(*it); ++rowit) - if (touched_nodes[*rowit] == numbers::invalid_unsigned_int) + if (touched_nodes[*rowit] == numbers::invalid_dof_index) ++active_row_length; if (active_row_length == best_row_length) if (connectivity.row_length(*it) > min_neighbors.second) @@ -431,7 +431,7 @@ namespace SparsityTools = connectivity.row_begin(min_neighbors.first); it != connectivity.row_end(min_neighbors.first); ++it) { - if (touched_nodes[*it] == numbers::invalid_unsigned_int) + if (touched_nodes[*it] == numbers::invalid_dof_index) { new_entries.push_back(*it); touched_nodes[*it] = groups.size()-1; @@ -446,7 +446,7 @@ namespace SparsityTools for (CompressedSimpleSparsityPattern::row_iterator it = connectivity.row_begin(new_entries[i]); it != connectivity.row_end(new_entries[i]); ++it) - if (touched_nodes[*it] == numbers::invalid_unsigned_int) + if (touched_nodes[*it] == numbers::invalid_dof_index) current_neighbors.insert(*it); current_neighbors.erase(new_entries[i]); }