From: Wolfgang Bangerth Date: Tue, 28 Mar 2006 23:19:09 +0000 (+0000) Subject: Use new function FiniteElementData::face_to_equivalent_cell_index X-Git-Tag: v8.0.0~11975 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0564b5d1403b5fd58350bc443439d8dffa817b6;p=dealii.git Use new function FiniteElementData::face_to_equivalent_cell_index to simplify code. git-svn-id: https://svn.dealii.org/trunk@12737 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index 6e07a62b47..4e2f891f87 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -2220,52 +2220,7 @@ FiniteElement::face_system_to_component_index (const unsigned int index) co // // in 1d, the face index is equal // to the cell index - Assert (((dim == 1) && is_primitive(index)) - || - // in 2d, construct it like - // this: - ((dim == 2) && - is_primitive (index < (GeometryInfo<2>::vertices_per_face * - this->dofs_per_vertex) - ? - index - : - GeometryInfo<2>::vertices_per_cell * - this->dofs_per_vertex + - (index - - GeometryInfo<2>::vertices_per_face * - this->dofs_per_vertex))) - || - // likewise in 3d, but more - // complicated - ((dim == 3) && - is_primitive (index < (GeometryInfo<3>::vertices_per_face * - this->dofs_per_vertex) - ? - index - : - (index < (GeometryInfo<3>::vertices_per_face * - this->dofs_per_vertex - + - GeometryInfo<3>::lines_per_face * - this->dofs_per_line) - ? - GeometryInfo<3>::vertices_per_cell * - this->dofs_per_vertex + - (index - - GeometryInfo<3>::vertices_per_face * - this->dofs_per_vertex) - : - GeometryInfo<3>::vertices_per_cell * - this->dofs_per_vertex + - GeometryInfo<3>::lines_per_cell * - this->dofs_per_line + - (index - - GeometryInfo<3>::vertices_per_face * - this->dofs_per_vertex - - - GeometryInfo<3>::lines_per_face * - this->dofs_per_line)))), + Assert (is_primitive(this->face_to_equivalent_cell_index(index)), typename FiniteElement::ExcShapeFunctionNotPrimitive(index)); return face_system_to_component_table[index];