From a3ef759d1ae5bac5e6e918bef43696e63e4f17a5 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 20 Oct 2017 14:57:22 -0400 Subject: [PATCH] remove hp::DoFHandler::ExcInvalidTriangulation for #610 --- include/deal.II/hp/dof_handler.h | 4 ---- source/hp/dof_handler.cc | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index db1023ee10..c9ad925335 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -679,10 +679,6 @@ namespace hp BOOST_SERIALIZATION_SPLIT_MEMBER() - /** - * Exception - */ - DeclException0 (ExcInvalidTriangulation); /** * Exception */ diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc index d6d9b57e15..7a25290dfe 100644 --- a/source/hp/dof_handler.cc +++ b/source/hp/dof_handler.cc @@ -606,8 +606,7 @@ namespace internal Assert (dof_handler.finite_elements->size() > 0, typename BaseClass::ExcNoFESelected()); Assert (dof_handler.tria->n_levels() > 0, - typename - BaseClass::ExcInvalidTriangulation()); + ExcMessage("The current Triangulation must not be empty.")); Assert (dof_handler.tria->n_levels() == dof_handler.levels.size (), ExcInternalError ()); @@ -633,7 +632,7 @@ namespace internal Assert (dof_handler.finite_elements->size() > 0, typename BaseClass::ExcNoFESelected()); Assert (dof_handler.tria->n_levels() > 0, - typename BaseClass::ExcInvalidTriangulation()); + ExcMessage("The current Triangulation must not be empty.")); Assert (dof_handler.tria->n_levels() == dof_handler.levels.size (), ExcInternalError ()); @@ -663,7 +662,7 @@ namespace internal Assert (dof_handler.finite_elements->size() > 0, typename BaseClass::ExcNoFESelected()); Assert (dof_handler.tria->n_levels() > 0, - typename BaseClass::ExcInvalidTriangulation()); + ExcMessage("The current Triangulation must not be empty.")); Assert (dof_handler.tria->n_levels() == dof_handler.levels.size (), ExcInternalError ()); -- 2.39.5