From: grahambenharper <grahambenharper@gmail.com>
Date: Sun, 1 Sep 2019 21:06:02 +0000 (-0600)
Subject: Update PolynomialsBDM degree and pass the degree to the base class constructor
X-Git-Tag: v9.2.0-rc1~1152^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a97b22c25297497682cde44f9853328ba585815;p=dealii.git

Update PolynomialsBDM degree and pass the degree to the base class constructor
---

diff --git a/include/deal.II/base/polynomials_bdm.h b/include/deal.II/base/polynomials_bdm.h
index 4e8219ecfd..7e4cd085a7 100644
--- a/include/deal.II/base/polynomials_bdm.h
+++ b/include/deal.II/base/polynomials_bdm.h
@@ -131,13 +131,6 @@ public:
            std::vector<Tensor<4, dim>> &third_derivatives,
            std::vector<Tensor<5, dim>> &fourth_derivatives) const override;
 
-  /**
-   * Return the degree of the BDM space, which is one less than the highest
-   * polynomial degree.
-   */
-  unsigned int
-  degree() const;
-
   /**
    * Return the name of the space, which is <tt>BDM</tt>.
    */
@@ -203,14 +196,6 @@ private:
 };
 
 
-template <int dim>
-inline unsigned int
-PolynomialsBDM<dim>::degree() const
-{
-  return polynomial_space.degree() - 1;
-}
-
-
 template <int dim>
 inline std::string
 PolynomialsBDM<dim>::name() const
diff --git a/source/base/polynomials_bdm.cc b/source/base/polynomials_bdm.cc
index 80a2abe0c1..953201b086 100644
--- a/source/base/polynomials_bdm.cc
+++ b/source/base/polynomials_bdm.cc
@@ -28,7 +28,7 @@ DEAL_II_NAMESPACE_OPEN
 
 template <int dim>
 PolynomialsBDM<dim>::PolynomialsBDM(const unsigned int k)
-  : TensorPolynomialsBase<dim>(k, n_polynomials(k))
+  : TensorPolynomialsBase<dim>(k + 1, n_polynomials(k))
   , polynomial_space(Polynomials::Legendre::generate_complete_basis(k))
   , monomials((dim == 2) ? (1) : (k + 2))
   , p_values(polynomial_space.n())
@@ -193,7 +193,8 @@ PolynomialsBDM<dim>::evaluate(
               // p(t) = t^(i+1)
               monomials[i + 1].value(unit_point(d), monovali[d]);
               // q(t) = t^(k-i)
-              monomials[degree() - i].value(unit_point(d), monovalk[d]);
+              monomials[this->degree() - 1 - i].value(unit_point(d),
+                                                      monovalk[d]);
             }
           if (values.size() != 0)
             {
diff --git a/tests/base/polynomials_bdm_01.cc b/tests/base/polynomials_bdm_01.cc
index 093185cf83..bc4043b459 100644
--- a/tests/base/polynomials_bdm_01.cc
+++ b/tests/base/polynomials_bdm_01.cc
@@ -32,7 +32,7 @@ void
 plot(const PolynomialsBDM<dim> &poly)
 {
   QTrapez<1>                  base_quadrature;
-  QIterated<dim>              quadrature(base_quadrature, poly.degree() + 4);
+  QIterated<dim>              quadrature(base_quadrature, poly.degree() + 3);
   std::vector<Tensor<1, dim>> values(poly.n());
   std::vector<Tensor<2, dim>> grads;
   std::vector<Tensor<3, dim>> grads2;
@@ -41,10 +41,10 @@ plot(const PolynomialsBDM<dim> &poly)
 
   for (unsigned int k = 0; k < quadrature.size(); ++k)
     {
-      if (k % (poly.degree() + 5) == 0)
-        deallog << "BDM" << poly.degree() << '<' << dim << '>' << std::endl;
+      if (k % (poly.degree() + 4) == 0)
+        deallog << "BDM" << poly.degree() - 1 << '<' << dim << '>' << std::endl;
 
-      deallog << "BDM" << poly.degree() << '<' << dim << '>' << '\t'
+      deallog << "BDM" << poly.degree() - 1 << '<' << dim << '>' << '\t'
               << quadrature.point(k);
       poly.evaluate(
         quadrature.point(k), values, grads, grads2, thirds, fourths);
diff --git a/tests/base/polynomials_bdm_02.cc b/tests/base/polynomials_bdm_02.cc
index 68834f1cdb..6c3a0dcbb6 100644
--- a/tests/base/polynomials_bdm_02.cc
+++ b/tests/base/polynomials_bdm_02.cc
@@ -32,7 +32,7 @@ void
 plot(const PolynomialsBDM<dim> &poly)
 {
   const PolynomialSpace<dim> legendre_poly_space =
-    Polynomials::Legendre::generate_complete_basis(poly.degree());
+    Polynomials::Legendre::generate_complete_basis(poly.degree() - 1);
 
   const Point<3> p0(0, 0, 0);
   const Point<3> p1(0.25, 0.5, 0.75);
@@ -57,16 +57,16 @@ plot(const PolynomialsBDM<dim> &poly)
 
   for (unsigned int k = 0; k < points.size(); ++k)
     {
-      if (k % (poly.degree() + 4) == 0)
-        deallog << "BDM" << poly.degree() << '<' << dim << '>' << std::endl;
+      if (k % (poly.degree() + 3) == 0)
+        deallog << "BDM" << poly.degree() - 1 << '<' << dim << '>' << std::endl;
 
       unsigned int start = dim * n_sub;
 
-      deallog << "BDM" << poly.degree() << '<' << dim << '>' << points[k]
+      deallog << "BDM" << poly.degree() - 1 << '<' << dim << '>' << points[k]
               << std::endl;
       poly.evaluate(points[k], values, grads, grads2, thirds, fourths);
 
-      for (unsigned int i = 0; i < poly.degree() + 1; ++i, start += dim)
+      for (unsigned int i = 0; i < poly.degree(); ++i, start += dim)
         for (unsigned int j = 0; j < dim; ++j)
           {
             for (unsigned int d1 = 0; d1 < dim; ++d1)