From 7cc677db205b14b3ca6b8c6688fa28e52a92302b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 3 Sep 2013 20:58:34 +0000 Subject: [PATCH] Use the correct data type for (invalid) default values of an array. git-svn-id: https://svn.dealii.org/trunk@30576 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/hp/dof_handler.cc | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc index 2096c95a4f..6e0cfe5cb7 100644 --- a/deal.II/source/hp/dof_handler.cc +++ b/deal.II/source/hp/dof_handler.cc @@ -580,7 +580,7 @@ namespace internal dof_handler.levels[level]->dof_offsets = std::vector::size_type> ( dof_handler.tria->n_raw_lines(level), - DoFHandler::invalid_dof_index); + (std::vector::size_type)(-1)); types::global_dof_index next_free_dof = 0; for (typename DoFHandler::active_cell_iterator @@ -619,7 +619,7 @@ namespace internal Assert (static_cast (std::count (dof_handler.levels[level]->dof_offsets.begin(), dof_handler.levels[level]->dof_offsets.end(), - DoFHandler::invalid_dof_index)) + (std::vector::size_type)(-1))) == dof_handler.tria->n_raw_lines(level) - dof_handler.tria->n_active_lines(level), ExcInternalError()); @@ -697,7 +697,7 @@ namespace internal dof_handler.levels[level]->dof_offsets = std::vector::size_type> ( dof_handler.tria->n_raw_quads(level), - DoFHandler::invalid_dof_index); + (std::vector::size_type)(-1)); types::global_dof_index next_free_dof = 0; for (typename DoFHandler::active_cell_iterator @@ -736,7 +736,7 @@ namespace internal Assert (static_cast (std::count (dof_handler.levels[level]->dof_offsets.begin(), dof_handler.levels[level]->dof_offsets.end(), - DoFHandler::invalid_dof_index)) + (std::vector::size_type)(-1))) == dof_handler.tria->n_raw_quads(level) - dof_handler.tria->n_active_quads(level), ExcInternalError()); @@ -849,7 +849,7 @@ namespace internal dof_handler.faces->lines.dof_offsets = std::vector::size_type> (dof_handler.tria->n_raw_lines(), - DoFHandler::invalid_dof_index); + (std::vector::size_type)(-1)); dof_handler.faces->lines.dofs = std::vector (n_line_slots, DoFHandler::invalid_dof_index); @@ -1063,7 +1063,7 @@ namespace internal dof_handler.levels[level]->dof_offsets = std::vector::size_type> (dof_handler.tria->n_raw_hexs(level), - DoFHandler::invalid_dof_index); + (std::vector::size_type)(-1)); types::global_dof_index next_free_dof = 0; for (typename DoFHandler::active_cell_iterator @@ -1102,7 +1102,7 @@ namespace internal Assert (static_cast (std::count (dof_handler.levels[level]->dof_offsets.begin(), dof_handler.levels[level]->dof_offsets.end(), - DoFHandler::invalid_dof_index)) + (std::vector::size_type)(-1))) == dof_handler.tria->n_raw_hexs(level) - dof_handler.tria->n_active_hexs(level), ExcInternalError()); @@ -1219,7 +1219,7 @@ namespace internal dof_handler.faces->quads.dof_offsets = std::vector::size_type> (dof_handler.tria->n_raw_quads(), - DoFHandler::invalid_dof_index); + (std::vector::size_type)(-1)); dof_handler.faces->quads.dofs = std::vector (n_quad_slots, DoFHandler::invalid_dof_index); @@ -2691,6 +2691,9 @@ namespace hp = std::vector (1, number_cache.locally_owned_dofs); + for (unsigned int level=0; levelcompress_data (); + // finally restore the user flags const_cast &>(*tria).load_user_flags(user_flags); } @@ -2728,6 +2731,9 @@ namespace hp #endif renumber_dofs_internal (new_numbers, dealii::internal::int2type()); + + for (unsigned int level=0; levelcompress_data (); } -- 2.39.5