From: guido Date: Thu, 14 Apr 2005 08:49:08 +0000 (+0000) Subject: stale pointers to embedding matrices removed X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bfd0b2113af85052d373b003886a67e0056ed9b;p=dealii-svn.git stale pointers to embedding matrices removed Refer to PolynomialSpace for ordering of shape functions git-svn-id: https://svn.dealii.org/trunk@10481 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_dgp.h b/deal.II/deal.II/include/fe/fe_dgp.h index 6764496986..f2e1340251 100644 --- a/deal.II/deal.II/include/fe/fe_dgp.h +++ b/deal.II/deal.II/include/fe/fe_dgp.h @@ -30,19 +30,10 @@ template class MappingQ; * polynomials form a Legendre basis on the unit square. Thus, the * mass matrix is diagonal, if the grid cells are parallelograms. * - * The shape functions of this element are composed of the Lagrange - * polynomials Li(x). In 2d, they form the basis - * Li(x) Lj(y) where - * i, with p the order of the finite - * element as given to the constructor. For example, for p=1, there - * are the finite element space on each cell is spanned by the three - * functions 1,x,y, although the actual shape functions may - * be linear combinations of these. Note that unlike the FE_DGQ - * element, the function xy is not part of the basis. - * - * Similarly, in 3d, the shape functions are Li(x) - * Lj(y) Lk(z) where - * i. + * The shape functions are defined in the class PolynomialSpace. The + * polynomials used inside PolynomialSpace are Polynomials::Legendre + * up to degree p given in FE_DGP. For the ordering of the + * basis functions, refer to PolynomialSpace. * * @author Guido Kanschat, 2001, 2002, Ralf Hartmann 2004 */ @@ -109,25 +100,6 @@ class FE_DGP : public FE_Poly,dim> */ struct Matrices { - /** - * Pointers to the embedding - * matrices, one for each - * polynomial degree starting - * from constant elements - */ - static const double * const embedding[][GeometryInfo::children_per_cell]; - - /** - * Number of elements (first - * index) the above field - * has. Equals the highest - * polynomial degree plus one - * for which the embedding - * matrices have been - * computed. - */ - static const unsigned int n_embedding_matrices; - /** * As @p embedding but for * projection matrices. @@ -188,36 +160,18 @@ class FE_DGP : public FE_Poly,dim> // declaration of explicit specializations of member variables, if the // compiler allows us to do that (the standard says we must) #ifndef DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG -template <> -const double * const FE_DGP<1>::Matrices::embedding[][GeometryInfo<1>::children_per_cell]; - -template <> -const unsigned int FE_DGP<1>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGP<1>::Matrices::projection_matrices[][GeometryInfo<1>::children_per_cell]; template <> const unsigned int FE_DGP<1>::Matrices::n_projection_matrices; -template <> -const double * const FE_DGP<2>::Matrices::embedding[][GeometryInfo<2>::children_per_cell]; - -template <> -const unsigned int FE_DGP<2>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGP<2>::Matrices::projection_matrices[][GeometryInfo<2>::children_per_cell]; template <> const unsigned int FE_DGP<2>::Matrices::n_projection_matrices; -template <> -const double * const FE_DGP<3>::Matrices::embedding[][GeometryInfo<3>::children_per_cell]; - -template <> -const unsigned int FE_DGP<3>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGP<3>::Matrices::projection_matrices[][GeometryInfo<3>::children_per_cell];