From: Nicola Giuliani Date: Thu, 24 Mar 2016 23:14:17 +0000 (+0100) Subject: modified test X-Git-Tag: v8.5.0-rc1~1172^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2410%2Fhead;p=dealii.git modified test --- diff --git a/source/fe/fe_dgq.inst.in b/source/fe/fe_dgq.inst.in index e3c6a0b763..7f556d4e89 100644 --- a/source/fe/fe_dgq.inst.in +++ b/source/fe/fe_dgq.inst.in @@ -17,19 +17,8 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { -#if deal_II_dimension <= deal_II_space_dimension +#if deal_II_dimension <= deal_II_space_dimension template class FE_DGQ; + template class FE_DGQArbitraryNodes; #endif } - - -for (deal_II_dimension : DIMENSIONS) - { - template class FE_DGQArbitraryNodes; - -#if deal_II_dimension != 3 - template class FE_DGQArbitraryNodes; -#endif - - } - diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index 9fc4c1a710..eee128e367 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -103,6 +103,12 @@ namespace FETools return new FE_DGQArbitraryNodes<1, 2>(quad); } template <> + FiniteElement<1, 3> * + FEFactory >::get (const Quadrature<1> &quad) const + { + return new FE_DGQArbitraryNodes<1, 3>(quad); + } + template <> FiniteElement<2, 2> * FEFactory >::get (const Quadrature<1> &quad) const { diff --git a/tests/fe/get_fe_from_name_01.cc b/tests/fe/get_fe_from_name_01.cc index 7075c721f1..27ef32ac62 100644 --- a/tests/fe/get_fe_from_name_01.cc +++ b/tests/fe/get_fe_from_name_01.cc @@ -77,11 +77,12 @@ int main () // gen.generate("FE_DGPNonparametric(1)"); gen.generate("FE_DGQ (1)"); gen.generate("FE_Q(1)"); - + gen.generate("FE_DGQArbitraryNodes(QGauss(2))"); // gen.generate("FE_Q_Hierarchical(2)"); // gen.generate("FE_DGPNonparametric(2)"); gen.generate("FE_DGQ(2)"); gen.generate("FE_Q(2)"); + gen.generate("FE_DGQArbitraryNodes(QGauss(3))"); // gen.generate("FESystem[FE_Q_Hierarchical(1)^2-FE_Q_Hierarchical(1)]"); // gen.generate("FESystem[FE_DGPNonparametric(1)^2-FE_Q_Hierarchical(1)]"); @@ -97,6 +98,8 @@ int main () // gen.generate("FESystem[FE_DGPNonparametric(1)^2-FE_DGQ(1)]"); gen.generate(" FESystem[FE_DGQ(1)^2 -FE_DGQ(1)]"); gen.generate("FESystem[FE_Q(1)^2-FE_DGQ(1)]"); + gen.generate("FESystem[FE_Q(1)^2-FE_DGQArbitraryNodes(QGauss(2))]"); + gen.generate("FESystem[FE_DGQArbitraryNodes(QGauss(2))^2-FE_Q(1)]"); // gen.generate("FESystem[FE_Q_Hierarchical(1)^2-FE_Q(1)]"); @@ -107,4 +110,3 @@ int main () return 0; } - diff --git a/tests/fe/get_fe_from_name_01.output b/tests/fe/get_fe_from_name_01.output index 6ef9630582..8369f3bd00 100644 --- a/tests/fe/get_fe_from_name_01.output +++ b/tests/fe/get_fe_from_name_01.output @@ -15,6 +15,14 @@ DEAL::FE_Q<3>(1) DEAL::FE_Q<1,2>(1) DEAL::FE_Q<1,3>(1) DEAL::FE_Q<2,3>(1) +DEAL::Read FE_DGQArbitraryNodes(QGauss(2)) +DEAL::Generated : +DEAL::FE_DGQArbitraryNodes<1>(QGauss(2)) +DEAL::FE_DGQArbitraryNodes<2>(QGauss(2)) +DEAL::FE_DGQArbitraryNodes<3>(QGauss(2)) +DEAL::FE_DGQArbitraryNodes<1,2>(QGauss(2)) +DEAL::FE_DGQArbitraryNodes<1,3>(QGauss(2)) +DEAL::FE_DGQArbitraryNodes<2,3>(QGauss(2)) DEAL::Read FE_DGQ(2) DEAL::Generated : DEAL::FE_DGQ<1>(2) @@ -31,6 +39,14 @@ DEAL::FE_Q<3>(2) DEAL::FE_Q<1,2>(2) DEAL::FE_Q<1,3>(2) DEAL::FE_Q<2,3>(2) +DEAL::Read FE_DGQArbitraryNodes(QGauss(3)) +DEAL::Generated : +DEAL::FE_DGQArbitraryNodes<1>(QGauss(3)) +DEAL::FE_DGQArbitraryNodes<2>(QGauss(3)) +DEAL::FE_DGQArbitraryNodes<3>(QGauss(3)) +DEAL::FE_DGQArbitraryNodes<1,2>(QGauss(3)) +DEAL::FE_DGQArbitraryNodes<1,3>(QGauss(3)) +DEAL::FE_DGQArbitraryNodes<2,3>(QGauss(3)) DEAL::Read FESystem[FE_DGQ(1)^2 -FE_DGQ(1)] DEAL::Generated : DEAL::FESystem<1>[FE_DGQ<1>(1)^2-FE_DGQ<1>(1)] @@ -47,6 +63,22 @@ DEAL::FESystem<3>[FE_Q<3>(1)^2-FE_DGQ<3>(1)] DEAL::FESystem<1,2>[FE_Q<1,2>(1)^2-FE_DGQ<1,2>(1)] DEAL::FESystem<1,3>[FE_Q<1,3>(1)^2-FE_DGQ<1,3>(1)] DEAL::FESystem<2,3>[FE_Q<2,3>(1)^2-FE_DGQ<2,3>(1)] +DEAL::Read FESystem[FE_Q(1)^2-FE_DGQArbitraryNodes(QGauss(2))] +DEAL::Generated : +DEAL::FESystem<1>[FE_Q<1>(1)^2-FE_DGQArbitraryNodes<1>(QGauss(2))] +DEAL::FESystem<2>[FE_Q<2>(1)^2-FE_DGQArbitraryNodes<2>(QGauss(2))] +DEAL::FESystem<3>[FE_Q<3>(1)^2-FE_DGQArbitraryNodes<3>(QGauss(2))] +DEAL::FESystem<1,2>[FE_Q<1,2>(1)^2-FE_DGQArbitraryNodes<1,2>(QGauss(2))] +DEAL::FESystem<1,3>[FE_Q<1,3>(1)^2-FE_DGQArbitraryNodes<1,3>(QGauss(2))] +DEAL::FESystem<2,3>[FE_Q<2,3>(1)^2-FE_DGQArbitraryNodes<2,3>(QGauss(2))] +DEAL::Read FESystem[FE_DGQArbitraryNodes(QGauss(2))^2-FE_Q(1)] +DEAL::Generated : +DEAL::FESystem<1>[FE_DGQArbitraryNodes<1>(QGauss(2))^2-FE_Q<1>(1)] +DEAL::FESystem<2>[FE_DGQArbitraryNodes<2>(QGauss(2))^2-FE_Q<2>(1)] +DEAL::FESystem<3>[FE_DGQArbitraryNodes<3>(QGauss(2))^2-FE_Q<3>(1)] +DEAL::FESystem<1,2>[FE_DGQArbitraryNodes<1,2>(QGauss(2))^2-FE_Q<1,2>(1)] +DEAL::FESystem<1,3>[FE_DGQArbitraryNodes<1,3>(QGauss(2))^2-FE_Q<1,3>(1)] +DEAL::FESystem<2,3>[FE_DGQArbitraryNodes<2,3>(QGauss(2))^2-FE_Q<2,3>(1)] DEAL::Read FESystem[FE_DGQ(1)^2-FE_Q(1)] DEAL::Generated : DEAL::FESystem<1>[FE_DGQ<1>(1)^2-FE_Q<1>(1)]