]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
duplicate degree from FE_Poly removed (was already present in FiniteElementData)
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 24 May 2005 12:32:31 +0000 (12:32 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 24 May 2005 12:32:31 +0000 (12:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@10723 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_poly.h
deal.II/deal.II/source/fe/fe_dgp.cc
deal.II/deal.II/source/fe/fe_dgp_monomial.cc
deal.II/deal.II/source/fe/fe_dgq.cc
deal.II/deal.II/source/fe/fe_poly.cc
deal.II/deal.II/source/fe/fe_q.cc
deal.II/deal.II/source/fe/fe_q_hierarchical.cc

index eeb56df10dea8fcf7482adf62255bb5fa2702771..197272eefd4fdaea207033357e18dd4e77be2b31 100644 (file)
@@ -66,8 +66,7 @@ class FE_Poly : public FiniteElement<dim>
                                     /**
                                      * Constructor.
                                      */
-    FE_Poly (unsigned int degree,
-            const POLY& poly_space,
+    FE_Poly (const POLY& poly_space,
             const FiniteElementData<dim> &fe_data,
             const std::vector<bool> &restriction_is_additive_flags,
             const std::vector<std::vector<bool> > &nonzero_components);
@@ -383,11 +382,6 @@ class FE_Poly : public FiniteElement<dim>
        std::vector<std::vector<Tensor<1,dim> > > shape_gradients;
     };
     
-                                    /**
-                                     * Degree of the polynomials.
-                                     */  
-    const unsigned int degree;
-
                                      /**
                                       * The polynomial space. Its type
                                       * is given by the template
index 6e3ddda46b7466a92640013a603d4b806114a377..9fa9881d02d4f7d76d3c186b18213c6f400a0e52 100644 (file)
@@ -25,7 +25,6 @@ template <int dim>
 FE_DGP<dim>::FE_DGP (const unsigned int degree)
                :
                FE_Poly<PolynomialSpace<dim>, dim> (
-                 degree,
                  PolynomialSpace<dim>(Polynomials::Legendre::generate_complete_basis(degree)),
                  FiniteElementData<dim>(get_dpo_vector(degree), 1, degree),
                  std::vector<bool>(FiniteElementData<dim>(get_dpo_vector(degree), 1, degree).dofs_per_cell,true),
index 094e8871eafa35433160c250c9a3232031e79be6..89ebb597a27493c9825ad06a22658b823a7725fd 100644 (file)
@@ -112,7 +112,6 @@ template <int dim>
 FE_DGPMonomial<dim>::FE_DGPMonomial (const unsigned int degree)
                :
                FE_Poly<PolynomialsP<dim>, dim> (
-                 degree,
                  PolynomialsP<dim>(degree),
                  FiniteElementData<dim>(get_dpo_vector(degree), 1, degree),
                  std::vector<bool>(FiniteElementData<dim>(get_dpo_vector(degree), 1, degree).dofs_per_cell,true),
index 6f5a9abbce1411a542b921c54393e5ce02a8f819..1a35488344e826d5a60192e34fb0006324e35f1b 100644 (file)
@@ -137,7 +137,6 @@ template <int dim>
 FE_DGQ<dim>::FE_DGQ (const unsigned int degree)
                :
                FE_Poly<TensorProductPolynomials<dim>, dim> (
-                 degree,
                  TensorProductPolynomials<dim>(Polynomials::LagrangeEquidistant::generate_complete_basis(degree)),
                  FiniteElementData<dim>(get_dpo_vector(degree), 1, degree),
                  std::vector<bool>(FiniteElementData<dim>(get_dpo_vector(degree),1, degree).dofs_per_cell, true),
index c1cfd7015a89a1a43049c1809971c9ae4b2e052e..88addbb89bedf60b19050cee057df490530e2c74 100644 (file)
 
 
 template <class POLY, int dim>
-FE_Poly<POLY,dim>::FE_Poly (unsigned int degree,
-                           const POLY& poly_space,
+FE_Poly<POLY,dim>::FE_Poly (const POLY& poly_space,
                            const FiniteElementData<dim> &fe_data,
                            const std::vector<bool> &restriction_is_additive_flags,
                            const std::vector<std::vector<bool> > &nonzero_components):
                FiniteElement<dim> (fe_data,
                                    restriction_is_additive_flags,
                                    nonzero_components),
-                degree(degree),
                 poly_space(poly_space)
 {}
 
@@ -35,7 +33,7 @@ template <class POLY, int dim>
 unsigned int
 FE_Poly<POLY,dim>::get_degree () const
 {
-  return degree;
+  return this->degree;
 }
 
 
index 277c7f21d3d084327ff19686023543a59b23de59..22e879c1ba5aee515a1deea38450b8bfea1c2be0 100644 (file)
@@ -423,7 +423,6 @@ template <int dim>
 FE_Q<dim>::FE_Q (const unsigned int degree)
                :
                FE_Poly<TensorProductPolynomials<dim>, dim> (
-                 degree,
                  TensorProductPolynomials<dim>(Polynomials::LagrangeEquidistant::generate_complete_basis(degree)),
                  FiniteElementData<dim>(get_dpo_vector(degree),1, degree),
                  std::vector<bool> (FiniteElementData<dim>(
index 7c6f847ac6eb901f686b8eed3562767fd5f0ac08..ab218ccaf82ee9bee2723c2d92da65d4c27dc8fe 100644 (file)
@@ -40,7 +40,6 @@ template <int dim>
 FE_Q_Hierarchical<dim>::FE_Q_Hierarchical (const unsigned int degree)
                :
                FE_Poly<TensorProductPolynomials<dim>, dim> (
-                 degree,
                  Polynomials::Hierarchical::generate_complete_basis(degree),
                  FiniteElementData<dim>(get_dpo_vector(degree),1, degree),
                  std::vector<bool> (FiniteElementData<dim>(

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.