From: guido Date: Tue, 31 May 2005 09:07:14 +0000 (+0000) Subject: remove obsolete mebedding matrices X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68725ef9d51cd755fbc4101aabbaaad4c11cd39;p=dealii-svn.git remove obsolete mebedding matrices git-svn-id: https://svn.dealii.org/trunk@10785 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index ffca626b66..49d8c48a7a 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -18,6 +18,7 @@ #include template class MappingQ; +template class Quadrature; /*!@addtogroup fe */ /*@{*/ @@ -77,6 +78,18 @@ class FE_DGQ : public FE_Poly,dim> * polynomials of degree p. */ FE_DGQ (const unsigned int p); + + /** + * Constructor for tensor product + * polynomials based on + * Polynomials::Lagrange + * interpolation of the support + * points in the quadrature rule + * points. The degree of + * these polynomials is + * points.size()-1. + */ + FE_DGQ (const Quadrature<1>& points); /** * Return a string that uniquely @@ -143,7 +156,7 @@ class FE_DGQ : public FE_Poly,dim> * Declare a nested class which * will hold static definitions * of various matrices such as - * embedding matrices. The + * projection matrices. The * definition of the various * static fields are in the files * fe_dgq_[123]d.cc in @@ -151,25 +164,6 @@ class FE_DGQ : 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[]; - - /** - * 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. @@ -257,36 +251,18 @@ class FE_DGQ : 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_DGQ<1>::Matrices::embedding[]; - -template <> -const unsigned int FE_DGQ<1>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGQ<1>::Matrices::projection_matrices[]; template <> const unsigned int FE_DGQ<1>::Matrices::n_projection_matrices; -template <> -const double * const FE_DGQ<2>::Matrices::embedding[]; - -template <> -const unsigned int FE_DGQ<2>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGQ<2>::Matrices::projection_matrices[]; template <> const unsigned int FE_DGQ<2>::Matrices::n_projection_matrices; -template <> -const double * const FE_DGQ<3>::Matrices::embedding[]; - -template <> -const unsigned int FE_DGQ<3>::Matrices::n_embedding_matrices; - template <> const double * const FE_DGQ<3>::Matrices::projection_matrices[];