From: Guido Kanschat Date: Tue, 20 Jan 2004 09:21:11 +0000 (+0000) Subject: node matrix changed to monomials X-Git-Tag: v8.0.0~15905 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50aa7254d940b9bb98703b073c4e9a253a6774d;p=dealii.git node matrix changed to monomials git-svn-id: https://svn.dealii.org/trunk@8326 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/polynomials_bdm.h b/deal.II/base/include/base/polynomials_bdm.h index 701102564e..f4a49f5068 100644 --- a/deal.II/base/include/base/polynomials_bdm.h +++ b/deal.II/base/include/base/polynomials_bdm.h @@ -208,11 +208,6 @@ class PolynomialsBDM */ std::vector > monomials; - /** - * Storage for derivatives of monomials - */ - std::vector > monomial_derivatives; - /** * Number of BDM * polynomials. diff --git a/deal.II/base/source/polynomials_bdm.cc b/deal.II/base/source/polynomials_bdm.cc index 9214bec3e3..c4771dc977 100644 --- a/deal.II/base/source/polynomials_bdm.cc +++ b/deal.II/base/source/polynomials_bdm.cc @@ -14,18 +14,16 @@ #include #include #include +#include using namespace std; using namespace Polynomials; -//TODO:[GK] Remove monomial_derivatives - template PolynomialsBDM::PolynomialsBDM (const unsigned int k) : - polynomial_space (Polynomials::Monomial::generate_complete_basis(k)), + polynomial_space (Polynomials::Legendre::generate_complete_basis(k)), monomials(1), - monomial_derivatives(1), n_pols(dim * polynomial_space.n()+2), p_values(polynomial_space.n()), p_grads(polynomial_space.n()), @@ -33,8 +31,6 @@ PolynomialsBDM::PolynomialsBDM (const unsigned int k) { Assert (dim == 2, ExcNotImplemented()); monomials[0] = Monomial (k+1); - for (unsigned int i=0;i void PolynomialsBDM::compute_node_matrix (Table<2,double>& A) const { - std::vector > legendre(2); - for (unsigned int i=0;i qface(polynomial_space.degree()+1); + std::vector > moment_weight(2); + for (unsigned int i=0;i(i); - Table<2,double> integrals (n(), n()); + QGauss qface(polynomial_space.degree()+1); std::vector > values(n()); std::vector > grads; @@ -164,12 +158,23 @@ PolynomialsBDM::compute_node_matrix (Table<2,double>& A) const p(1) = x; break; } +// std::cerr << p +// << '\t' << moment_weight[0].value(x) +// << '\t' << moment_weight[1].value(x) +// ; + compute (p, values, grads, grad_grads); + for (unsigned int i=0;i