From 5acc631827e1e25e677e2ede632eab73f8c384f3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 11 Oct 2017 08:55:47 -0600 Subject: [PATCH] Replace exception without message by ones with a message. --- include/deal.II/dofs/dof_renumbering.h | 7 ------- source/dofs/dof_renumbering.cc | 25 ++++++++++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/deal.II/dofs/dof_renumbering.h b/include/deal.II/dofs/dof_renumbering.h index 523b5b0eff..e79b96b347 100644 --- a/include/deal.II/dofs/dof_renumbering.h +++ b/include/deal.II/dofs/dof_renumbering.h @@ -1084,13 +1084,6 @@ namespace DoFRenumbering "been initialized, i.e., it doesn't appear that DoF indices " "have been distributed on it."); - /** - * Exception - * - * @ingroup Exceptions - */ - DeclException0 (ExcRenumberingIncomplete); - /** * Exception * diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index 702bde7415..78a1745448 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -527,7 +527,7 @@ namespace DoFRenumbering ((dof_handler.n_locally_owned_dofs() < dof_handler.n_dofs()) && (result <= dof_handler.n_dofs())), - ExcRenumberingIncomplete()); + ExcInternalError()); dof_handler.renumber_dofs (renumbering); } @@ -556,7 +556,7 @@ namespace DoFRenumbering if (result == 0) return; Assert (result == dof_handler.n_dofs(level), - ExcRenumberingIncomplete()); + ExcInternalError()); if (renumbering.size()!=0) dof_handler.renumber_dofs (level, renumbering); @@ -834,7 +834,7 @@ namespace DoFRenumbering ((dof_handler.n_locally_owned_dofs() < dof_handler.n_dofs()) && (result <= dof_handler.n_dofs())), - ExcRenumberingIncomplete()); + ExcInternalError()); dof_handler.renumber_dofs (renumbering); } @@ -862,7 +862,7 @@ namespace DoFRenumbering return; Assert (result == dof_handler.n_dofs(), - ExcRenumberingIncomplete()); + ExcInternalError()); dof_handler.renumber_dofs (renumbering); } @@ -871,7 +871,8 @@ namespace DoFRenumbering template void - block_wise (DoFHandler &dof_handler, const unsigned int level) + block_wise (DoFHandler &dof_handler, + const unsigned int level) { Assert(dof_handler.n_dofs(level) != numbers::invalid_dof_index, ExcDoFHandlerNotInitialized()); @@ -892,7 +893,7 @@ namespace DoFRenumbering if (result == 0) return; Assert (result == dof_handler.n_dofs(level), - ExcRenumberingIncomplete()); + ExcInternalError()); if (renumbering.size()!=0) dof_handler.renumber_dofs (level, renumbering); @@ -1204,7 +1205,7 @@ namespace DoFRenumbering ((dof_handler.n_locally_owned_dofs() < dof_handler.n_dofs()) && (next_free <= dof_handler.n_dofs())), - ExcRenumberingIncomplete()); + ExcInternalError()); // make sure that all local DoFs got new numbers assigned Assert (std::find (renumbering.begin(), renumbering.end(), @@ -1404,7 +1405,10 @@ namespace DoFRenumbering } } } - Assert(global_index == n_global_dofs, ExcRenumberingIncomplete()); + Assert(global_index == n_global_dofs, + ExcMessage("Traversing over the given set of cells did not cover all " + "degrees of freedom in the DoFHandler. Does the set of cells " + "not include all active cells?")); for (types::global_dof_index i=0; i