From: Wolfgang Bangerth Date: Fri, 30 Mar 2001 11:55:33 +0000 (+0000) Subject: Remove preprocessor kludge again. X-Git-Tag: v8.0.0~19425 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a41a572b929ba44c4de0336aa4d8aea3a25b119f;p=dealii.git Remove preprocessor kludge again. git-svn-id: https://svn.dealii.org/trunk@4355 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_q.h b/deal.II/deal.II/include/fe/fe_q.h index 6c8e6f9aca..9e3c72af7e 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -261,8 +261,7 @@ class FE_Q : public FiniteElement * In 1d, this function does * nothing. */ - static void build_face_renumbering (const FiniteElementData &fe_data, - const unsigned int degree, + static void build_face_renumbering (const unsigned int degree, std::vector &numbering); /** diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index afd4c35ad4..7fcf0b9d6f 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -47,14 +47,11 @@ FE_Q::FE_Q (const unsigned int degree) poly = new TensorProductPolynomials (v); - // do some internal book-keeping + // do some internal book-keeping on + // cells and faces. if in 1d, the + // face function is empty build_renumbering (*this, degree, renumber); -//TODO:[WB] externalize this to a proper template function -#if deal_II_dimension > 1 - build_face_renumbering (FiniteElementData(FE_Q::get_dpo_vector(degree),1), - degree, - face_renumber); -#endif + build_face_renumbering (degree, face_renumber); // copy constraint matrices if they // are defined. otherwise set them @@ -906,10 +903,10 @@ FE_Q::build_renumbering (const FiniteElementData &fe_data, template void -FE_Q::build_face_renumbering (const FiniteElementData &fe_data, - const unsigned int degree, +FE_Q::build_face_renumbering (const unsigned int degree, std::vector &numbering) { + FiniteElementData fe_data(FE_Q::get_dpo_vector(degree),1); FE_Q::build_renumbering (fe_data, degree, numbering); } @@ -918,8 +915,7 @@ FE_Q::build_face_renumbering (const FiniteElementData &fe_data, template <> void -FE_Q<1>::build_face_renumbering (const FiniteElementData<0> &, - const unsigned int, +FE_Q<1>::build_face_renumbering (const unsigned int, std::vector&) {}