From ae8dc3e6e38034ee211366381e17f9059f5473a1 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 28 Jul 2006 15:31:29 +0000 Subject: [PATCH] Simply code a bit git-svn-id: https://svn.dealii.org/trunk@13467 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_objects.cc | 42 +++++----------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_objects.cc b/deal.II/deal.II/source/dofs/dof_objects.cc index b1734aa911..792515ef34 100644 --- a/deal.II/deal.II/source/dofs/dof_objects.cc +++ b/deal.II/deal.II/source/dofs/dof_objects.cc @@ -40,29 +40,16 @@ namespace internal const unsigned int fe_index, const unsigned int local_index) const { - unsigned int dofs_per_obj; - switch (dim) - { - case 1 : - dofs_per_obj = dof_handler.get_fe().dofs_per_line; - break; - case 2 : - dofs_per_obj = dof_handler.get_fe().dofs_per_quad; - break; - case 3 : - dofs_per_obj = dof_handler.get_fe().dofs_per_hex; - } - Assert (fe_index == ::DoFHandler::default_fe_index, ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); - Assert (local_index(), + 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()); - return dofs[obj_index * dofs_per_obj + local_index]; + return dofs[obj_index * dof_handler.get_fe().template n_dofs_per_object() + local_index]; } @@ -77,29 +64,16 @@ namespace internal const unsigned int local_index, const unsigned int global_index) { - unsigned int dofs_per_obj; - switch (dim) - { - case 1 : - dofs_per_obj = dof_handler.get_fe().dofs_per_line; - break; - case 2 : - dofs_per_obj = dof_handler.get_fe().dofs_per_quad; - break; - case 3 : - dofs_per_obj = dof_handler.get_fe().dofs_per_hex; - } - Assert (fe_index == ::DoFHandler::default_fe_index, ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects")); - Assert (local_index(), + 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()); - dofs[obj_index * dofs_per_obj + local_index] = global_index; + dofs[obj_index * dof_handler.get_fe().template n_dofs_per_object() + local_index] = global_index; } // explicit instantiations -- 2.39.5