From 16d3611ed3ad3e2c43c211cf959ae28844ef4508 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Sun, 28 Jun 2015 21:41:52 +0200 Subject: [PATCH] Add GaussLog to the set of recognized quadrature rules and fix tests --- source/fe/fe_dgq.cc | 16 ++++++++++++++++ tests/fe/get_name_01.output | 2 +- tests/fe/get_name_02.output | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/source/fe/fe_dgq.cc b/source/fe/fe_dgq.cc index e324bf2b95..227a74a791 100644 --- a/source/fe/fe_dgq.cc +++ b/source/fe/fe_dgq.cc @@ -848,6 +848,22 @@ FE_DGQArbitraryNodes::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 1ed75a4dc1..46dad70ffa 100644 --- 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 4b4630c828..79b9fc165a 100644 --- 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)) -- 2.39.5