From: Wolfgang Bangerth Date: Mon, 7 Nov 2016 06:20:51 +0000 (-0700) Subject: Remove the FE_DGPNonparametric::degree variable. X-Git-Tag: v8.5.0-rc1~446^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3485%2Fhead;p=dealii.git Remove the FE_DGPNonparametric::degree variable. It shadows the variable of same name in the base class, and always has the same value. --- diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h index c40ddceb5f..6c7e535bcb 100644 --- a/include/deal.II/fe/fe_dgp_nonparametric.h +++ b/include/deal.II/fe/fe_dgp_nonparametric.h @@ -596,11 +596,6 @@ private: std::vector get_dpo_vector (const unsigned int degree); - /** - * Degree of the polynomials. - */ - const unsigned int degree; - /** * Pointer to an object representing the polynomial space used here. */ diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index 70dbf84791..58a93dc7f6 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -38,7 +38,6 @@ FE_DGPNonparametric::FE_DGPNonparametric (const unsigned int degre std::vector( FiniteElementData(get_dpo_vector(degree),1, degree).dofs_per_cell, std::vector(1,true))), - degree(degree), polynomial_space (Polynomials::Legendre::generate_complete_basis(degree)) { const unsigned int n_dofs = this->dofs_per_cell; @@ -107,7 +106,7 @@ FE_DGPNonparametric::get_name () const std::ostringstream namebuf; namebuf << "FE_DGPNonparametric<" << Utilities::dim_string(dim,spacedim) - << ">(" << degree << ")"; + << ">(" << this->degree << ")"; return namebuf.str(); } @@ -585,7 +584,7 @@ template unsigned int FE_DGPNonparametric::get_degree () const { - return degree; + return this->degree; }