From b366e208854065c8a0521417684e7dd269c0bf64 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Thu, 28 Apr 2016 23:09:57 +0200 Subject: [PATCH] Fix test of exception in FE_Q at degree 0 --- source/fe/fe_q.cc | 7 +++---- source/fe/fe_q_base.cc | 3 ++- tests/fe/fe_q_01.output | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/fe/fe_q.cc b/source/fe/fe_q.cc index 343d5f5839..b1ad9218e5 100644 --- a/source/fe/fe_q.cc +++ b/source/fe/fe_q.cc @@ -25,7 +25,6 @@ DEAL_II_NAMESPACE_OPEN namespace { - template std::vector > get_QGaussLobatto_points (const unsigned int degree) { @@ -33,7 +32,7 @@ namespace return QGaussLobatto<1>(degree+1).get_points(); else { - typedef FE_Q_Base, dim, spacedim> FEQ; + typedef FE_Q_Base, 1, 1> FEQ; AssertThrow(false, typename FEQ::ExcFEQCannotHaveDegree0()); } return std::vector >(); @@ -46,13 +45,13 @@ template FE_Q::FE_Q (const unsigned int degree) : FE_Q_Base, dim, spacedim> - (TensorProductPolynomials(Polynomials::generate_complete_Lagrange_basis(get_QGaussLobatto_points(degree))), + (TensorProductPolynomials(Polynomials::generate_complete_Lagrange_basis(get_QGaussLobatto_points(degree))), FiniteElementData(this->get_dpo_vector(degree), 1, degree, FiniteElementData::H1), std::vector (1, false)) { - this->initialize(get_QGaussLobatto_points(degree)); + this->initialize(get_QGaussLobatto_points(degree)); } diff --git a/source/fe/fe_q_base.cc b/source/fe/fe_q_base.cc index dcb28803f2..f8f9e64194 100644 --- a/source/fe/fe_q_base.cc +++ b/source/fe/fe_q_base.cc @@ -1120,7 +1120,8 @@ template std::vector FE_Q_Base::get_dpo_vector(const unsigned int degree) { - AssertThrow(degree>0, ExcFEQCannotHaveDegree0()); + typedef FE_Q_Base FEQ; + AssertThrow(degree>0, typename FEQ::ExcFEQCannotHaveDegree0()); std::vector dpo(dim+1, 1U); for (unsigned int i=1; i