From cf7683f8e9812a993835ec2b9c9de2101a81666b Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 27 Jun 2022 17:52:04 +0200 Subject: [PATCH] Simplify assertion by AssertIndexRange --- include/deal.II/dofs/dof_objects.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/include/deal.II/dofs/dof_objects.h b/include/deal.II/dofs/dof_objects.h index 151ba7551b..c9c3444fdd 100644 --- a/include/deal.II/dofs/dof_objects.h +++ b/include/deal.II/dofs/dof_objects.h @@ -182,20 +182,16 @@ namespace internal const unsigned int local_index) { (void)fe_index; - Assert( - (fe_index == dealii::DoFHandler::default_fe_index), - ExcMessage( - "Only the default FE index is allowed for non-hp-DoFHandler objects")); - Assert( - local_index < dof_handler.get_fe().template n_dofs_per_object(), - ExcIndexRange(local_index, - 0, - dof_handler.get_fe().template n_dofs_per_object())); - Assert(obj_index * - dof_handler.get_fe().template n_dofs_per_object() + - local_index < - dofs.size(), - ExcInternalError()); + Assert((fe_index == + dealii::DoFHandler::default_fe_index), + ExcMessage("Only the default FE index is allowed for DoFHandler " + "objects without hp capability")); + AssertIndexRange(local_index, + dof_handler.get_fe().template n_dofs_per_object()); + AssertIndexRange( + obj_index * dof_handler.get_fe().template n_dofs_per_object() + + local_index, + dofs.size()); return dofs[obj_index * dof_handler.get_fe().template n_dofs_per_object() + -- 2.39.5