From a2e497dab4f74cdce85ebcd85dec1c7e1f49cbf1 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 24 May 2005 12:32:31 +0000 Subject: [PATCH] duplicate degree from FE_Poly removed (was already present in FiniteElementData) git-svn-id: https://svn.dealii.org/trunk@10723 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_poly.h | 8 +------- deal.II/deal.II/source/fe/fe_dgp.cc | 1 - deal.II/deal.II/source/fe/fe_dgp_monomial.cc | 1 - deal.II/deal.II/source/fe/fe_dgq.cc | 1 - deal.II/deal.II/source/fe/fe_poly.cc | 6 ++---- deal.II/deal.II/source/fe/fe_q.cc | 1 - deal.II/deal.II/source/fe/fe_q_hierarchical.cc | 1 - 7 files changed, 3 insertions(+), 16 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_poly.h b/deal.II/deal.II/include/fe/fe_poly.h index eeb56df10d..197272eefd 100644 --- a/deal.II/deal.II/include/fe/fe_poly.h +++ b/deal.II/deal.II/include/fe/fe_poly.h @@ -66,8 +66,7 @@ class FE_Poly : public FiniteElement /** * Constructor. */ - FE_Poly (unsigned int degree, - const POLY& poly_space, + FE_Poly (const POLY& poly_space, const FiniteElementData &fe_data, const std::vector &restriction_is_additive_flags, const std::vector > &nonzero_components); @@ -383,11 +382,6 @@ class FE_Poly : public FiniteElement std::vector > > shape_gradients; }; - /** - * Degree of the polynomials. - */ - const unsigned int degree; - /** * The polynomial space. Its type * is given by the template diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc index 6e3ddda46b..9fa9881d02 100644 --- a/deal.II/deal.II/source/fe/fe_dgp.cc +++ b/deal.II/deal.II/source/fe/fe_dgp.cc @@ -25,7 +25,6 @@ template FE_DGP::FE_DGP (const unsigned int degree) : FE_Poly, dim> ( - degree, PolynomialSpace(Polynomials::Legendre::generate_complete_basis(degree)), FiniteElementData(get_dpo_vector(degree), 1, degree), std::vector(FiniteElementData(get_dpo_vector(degree), 1, degree).dofs_per_cell,true), diff --git a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc index 094e8871ea..89ebb597a2 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc @@ -112,7 +112,6 @@ template FE_DGPMonomial::FE_DGPMonomial (const unsigned int degree) : FE_Poly, dim> ( - degree, PolynomialsP(degree), FiniteElementData(get_dpo_vector(degree), 1, degree), std::vector(FiniteElementData(get_dpo_vector(degree), 1, degree).dofs_per_cell,true), diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 6f5a9abbce..1a35488344 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -137,7 +137,6 @@ template FE_DGQ::FE_DGQ (const unsigned int degree) : FE_Poly, dim> ( - degree, TensorProductPolynomials(Polynomials::LagrangeEquidistant::generate_complete_basis(degree)), FiniteElementData(get_dpo_vector(degree), 1, degree), std::vector(FiniteElementData(get_dpo_vector(degree),1, degree).dofs_per_cell, true), diff --git a/deal.II/deal.II/source/fe/fe_poly.cc b/deal.II/deal.II/source/fe/fe_poly.cc index c1cfd7015a..88addbb89b 100644 --- a/deal.II/deal.II/source/fe/fe_poly.cc +++ b/deal.II/deal.II/source/fe/fe_poly.cc @@ -18,15 +18,13 @@ template -FE_Poly::FE_Poly (unsigned int degree, - const POLY& poly_space, +FE_Poly::FE_Poly (const POLY& poly_space, const FiniteElementData &fe_data, const std::vector &restriction_is_additive_flags, const std::vector > &nonzero_components): FiniteElement (fe_data, restriction_is_additive_flags, nonzero_components), - degree(degree), poly_space(poly_space) {} @@ -35,7 +33,7 @@ template unsigned int FE_Poly::get_degree () const { - return degree; + return this->degree; } diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 277c7f21d3..22e879c1ba 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -423,7 +423,6 @@ template FE_Q::FE_Q (const unsigned int degree) : FE_Poly, dim> ( - degree, TensorProductPolynomials(Polynomials::LagrangeEquidistant::generate_complete_basis(degree)), FiniteElementData(get_dpo_vector(degree),1, degree), std::vector (FiniteElementData( diff --git a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc index 7c6f847ac6..ab218ccaf8 100644 --- a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc +++ b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc @@ -40,7 +40,6 @@ template FE_Q_Hierarchical::FE_Q_Hierarchical (const unsigned int degree) : FE_Poly, dim> ( - degree, Polynomials::Hierarchical::generate_complete_basis(degree), FiniteElementData(get_dpo_vector(degree),1, degree), std::vector (FiniteElementData( -- 2.39.5