]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove preprocessor kludge again.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 30 Mar 2001 11:55:33 +0000 (11:55 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 30 Mar 2001 11:55:33 +0000 (11:55 +0000)
git-svn-id: https://svn.dealii.org/trunk@4355 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_q.h
deal.II/deal.II/source/fe/fe_q.cc

index 6c8e6f9aca499357b94dc678ea74b526349d4947..9e3c72af7eb771cac39a6a5f41f60d6dee1f0a54 100644 (file)
@@ -261,8 +261,7 @@ class FE_Q : public FiniteElement<dim>
                                      * In 1d, this function does
                                      * nothing.
                                      */
-    static void build_face_renumbering (const FiniteElementData<dim-1> &fe_data,
-                                       const unsigned int              degree,
+    static void build_face_renumbering (const unsigned int              degree,
                                        std::vector<unsigned int>      &numbering);
 
                                     /**
index afd4c35ad4262bf7a019af4ead415bce2b06180c..7fcf0b9d6f111ce2fd58d7bc76c6d8b69f10cb1f 100644 (file)
@@ -47,14 +47,11 @@ FE_Q<dim>::FE_Q (const unsigned int degree)
   
   poly = new TensorProductPolynomials<dim> (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<dim-1>(FE_Q<dim-1>::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<dim>::build_renumbering (const FiniteElementData<dim> &fe_data,
 
 template <int dim>
 void
-FE_Q<dim>::build_face_renumbering (const FiniteElementData<dim-1> &fe_data,
-                                  const unsigned int              degree,
+FE_Q<dim>::build_face_renumbering (const unsigned int              degree,
                                   std::vector<unsigned int>      &numbering)
 {
+  FiniteElementData<dim-1> fe_data(FE_Q<dim-1>::get_dpo_vector(degree),1);
   FE_Q<dim-1>::build_renumbering (fe_data, degree, numbering); 
 }
 
@@ -918,8 +915,7 @@ FE_Q<dim>::build_face_renumbering (const FiniteElementData<dim-1> &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<unsigned int>&)
 {}
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.