Add GaussLog to the set of recognized quadrature rules and fix tests

diff --git a/source/fe/fe_dgq.cc b/source/fe/fe_dgq.cc
index e324bf2b95d728b6b44332a7630183d859ad334e..227a74a79136b6f433356dc509ecc676ce628dcc 100644 (file)
--- a/source/fe/fe_dgq.cc
+++ b/source/fe/fe_dgq.cc
@@ -848,6 +848,22 @@ FE_DGQArbitraryNodes<dim,spacedim>::get_name () const
       return namebuf.str();
     }
 
+  // Check whether the support points come from QGauss.
+  const QGaussLog<1> points_glog(this->degree+1);
+  bool gauss_log = true;
+  for (unsigned int j=0; j<=this->degree; j++)
+    if (points[j] != points_glog.point(j)(0))
+      {
+        gauss_log = false;
+        break;
+      }
+
+  if (gauss_log == true)
+    {
+      namebuf << "FE_DGQArbitraryNodes<" << dim << ">(QGaussLog(" << this->degree+1 << "))";
+      return namebuf.str();
+    }
+
   // All guesses exhausted
   namebuf << "FE_DGQArbitraryNodes<" << dim << ">(QUnknownNodes(" << this->degree+1 << "))";
   return namebuf.str();

diff --git a/tests/fe/get_name_01.output b/tests/fe/get_name_01.output
index 1ed75a4dc1a7c156f98a08d7f5ce4060494bb418..46dad70ffa525efe4ef72a9d2a5ddd346f764b87 100644 (file)
--- a/tests/fe/get_name_01.output
+++ b/tests/fe/get_name_01.output
@@ -3,4 +3,4 @@ DEAL::FE_Q<2>(1)
 DEAL::FE_Q<2>(QGaussLobatto(4))
 DEAL::FE_DGQArbitraryNodes<2>(QGauss(5))
 DEAL::FE_DGQArbitraryNodes<2>(QGaussLobatto(5))
-DEAL::FE_DGQArbitraryNodes<2>(QGauss(3))
+DEAL::FE_DGQArbitraryNodes<2>(QGaussLog(3))

diff --git a/tests/fe/get_name_02.output b/tests/fe/get_name_02.output
index 4b4630c8280c04d5df092b9eef59d96b373e5771..79b9fc165a79f8ae697f9d37e2a7b63b4aed83fe 100644 (file)
--- a/tests/fe/get_name_02.output
+++ b/tests/fe/get_name_02.output
@@ -3,4 +3,4 @@ DEAL::FE_Q<2,3>(1)
 DEAL::FE_Q<2,3>(QGaussLobatto(4))
 DEAL::FE_DGQArbitraryNodes<2>(QGauss(5))
 DEAL::FE_DGQArbitraryNodes<2>(QGaussLobatto(5))
-DEAL::FE_DGQArbitraryNodes<2>(QGauss(3))
+DEAL::FE_DGQArbitraryNodes<2>(QGaussLog(3))