Change many tests to use equidistant points rather than GL points

diff --git a/tests/aniso/fe_tools.cc b/tests/aniso/fe_tools.cc
index 834a2da01307388807203d7002c4bd3b723ac74b..5b150d4aa5e97c44d3b2a147ca09e4a239350202 100644 (file)
--- a/tests/aniso/fe_tools.cc
+++ b/tests/aniso/fe_tools.cc
@@ -28,6 +28,7 @@
 #include <deal.II/fe/fe_dgp.h>
 #include <deal.II/fe/fe_raviart_thomas.h>
 #include <deal.II/fe/fe_system.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <deal.II/fe/fe_tools.h>
 
@@ -125,8 +126,8 @@ void test_projection (std::ostream &out)
   FE_DGQ<dim> q0(0);
   FE_DGQ<dim> q1(1);
   FE_DGQ<dim> q2(2);
-  FE_DGQ<dim> q3(3);
-  FE_DGQ<dim> q4(4);
+  FE_DGQArbitraryNodes<dim> q3(QIterated<1>(QTrapez<1>(),3));
+  FE_DGQArbitraryNodes<dim> q4(QIterated<1>(QTrapez<1>(),4));
 
   FE_DGP<dim> p0(0);
   FE_DGP<dim> p1(1);

diff --git a/tests/bits/error_estimator_01.cc b/tests/bits/error_estimator_01.cc
index 1fa0fda70d3fbf697841eef48e6dfb6382687a8b..8db504e824e254c6c22a45208dbeeb93c2c7ddf1 100644 (file)
--- a/tests/bits/error_estimator_01.cc
+++ b/tests/bits/error_estimator_01.cc
@@ -130,7 +130,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/error_estimator_02.cc b/tests/bits/error_estimator_02.cc
index fd7bd09dc394c141e3cad7bd5bb0932390ffef5c..b93da468532f0fc0a2a228eaa5e66588e88e8a32 100644 (file)
--- a/tests/bits/error_estimator_02.cc
+++ b/tests/bits/error_estimator_02.cc
@@ -130,7 +130,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/mapping_q_eulerian_06.cc b/tests/bits/mapping_q_eulerian_06.cc
index 2a75c8e19b4ab8fa18b9e06867ecfe6fb241460b..1a2c1470d8a6329497cde1aa300917381adec1ed 100644 (file)
--- a/tests/bits/mapping_q_eulerian_06.cc
+++ b/tests/bits/mapping_q_eulerian_06.cc
@@ -44,7 +44,7 @@ void test(unsigned int degree)
   const unsigned int spacedim = 1;
   Triangulation<dim, spacedim> tria;
   GridGenerator::hyper_cube(tria, 0, 1);
-  FE_Q<dim, spacedim> fe(degree);
+  FE_Q<dim, spacedim> fe(QIterated<1>(QTrapez<1>(),degree));
 
   DoFHandler<dim, spacedim> shift_dh(tria);
 
@@ -87,4 +87,3 @@ int main ()
   test(3);
   return 0;
 }
-

diff --git a/tests/bits/point_difference_01.cc b/tests/bits/point_difference_01.cc
index b74b69b1639ec1d9074cb8aa6be8508050f80794..0072e23ec145578f800403fded54bea3f19236f6 100644 (file)
--- a/tests/bits/point_difference_01.cc
+++ b/tests/bits/point_difference_01.cc
@@ -110,7 +110,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/point_difference_02.cc b/tests/bits/point_difference_02.cc
index b6d8ebf93c81a0f3b42094addb0a97c21159a87c..c6038e3df5acf1de20abfcd39ddbe139dfdd7ad6 100644 (file)
--- a/tests/bits/point_difference_02.cc
+++ b/tests/bits/point_difference_02.cc
@@ -115,7 +115,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/point_gradient_01.cc b/tests/bits/point_gradient_01.cc
index 92617096e7ccd9fe612429d358d222f286985311..ef00440d5fd9dd6ad5233909ac28d9f72712a8b8 100644 (file)
--- a/tests/bits/point_gradient_01.cc
+++ b/tests/bits/point_gradient_01.cc
@@ -138,7 +138,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/point_gradient_02.cc b/tests/bits/point_gradient_02.cc
index e403484113b089027d06fc8a0cbb8cb25a74a0d4..81b4eaa3d81995c1649076bb5e21197dccf2a3a2 100644 (file)
--- a/tests/bits/point_gradient_02.cc
+++ b/tests/bits/point_gradient_02.cc
@@ -139,7 +139,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   MappingQGeneric<dim> mapping(1);
   dof.distribute_dofs(element);

diff --git a/tests/bits/point_gradient_hp_01.cc b/tests/bits/point_gradient_hp_01.cc
index dac0ee3da19ad8d5a4b86af7426758f289e36275..2a812aad78390dfda5c82f50d820dd41c6fa23a8 100644 (file)
--- a/tests/bits/point_gradient_hp_01.cc
+++ b/tests/bits/point_gradient_hp_01.cc
@@ -140,9 +140,9 @@ check ()
   make_mesh (tria);
 
   hp::FECollection<dim> fe;
-  fe.push_back (FE_Q<dim>(3));
-  fe.push_back (FE_Q<dim>(4));
-  fe.push_back (FE_Q<dim>(5));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),5)));
 
   hp::DoFHandler<dim> dof_handler (tria);
 

diff --git a/tests/bits/point_gradient_hp_02.cc b/tests/bits/point_gradient_hp_02.cc
index 1e2e577f2ac0ce959840e90fc74368757f6259c4..14aa1c18cd0f31ff1bd55f2f428bd54c2266caf3 100644 (file)
--- a/tests/bits/point_gradient_hp_02.cc
+++ b/tests/bits/point_gradient_hp_02.cc
@@ -141,9 +141,9 @@ check ()
   make_mesh (tria);
 
   hp::FECollection<dim> fe;
-  fe.push_back (FE_Q<dim>(3));
-  fe.push_back (FE_Q<dim>(4));
-  fe.push_back (FE_Q<dim>(5));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),5)));
 
   hp::MappingCollection<dim> mapping_1;
   mapping_1.push_back(MappingQGeneric<dim>(1));

diff --git a/tests/bits/point_value_01.cc b/tests/bits/point_value_01.cc
index 46f0b815b41c7bee25ebfd5470ba228581b883e6..0dc3b50996c6c05eed7fa9ea072800d1b84c4c8c 100644 (file)
--- a/tests/bits/point_value_01.cc
+++ b/tests/bits/point_value_01.cc
@@ -109,7 +109,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/bits/point_value_02.cc b/tests/bits/point_value_02.cc
index daf1bfebc8f8fb56bb4b34948a1d0ad5fbdc6a88..c4b16212c11c96646f141768337a9c9686dcf700 100644 (file)
--- a/tests/bits/point_value_02.cc
+++ b/tests/bits/point_value_02.cc
@@ -110,7 +110,7 @@ check ()
   Triangulation<dim> tria;
   make_mesh (tria);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tria);
   MappingQGeneric<dim> mapping(1);
   dof.distribute_dofs(element);

diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc
index 743b06ee6362180454b45aed491edb74dfc263f9..b260cc9d31a4dcb80665a7bf5ad4198bb1d04b3b 100644 (file)
--- a/tests/codim_one/error_estimator_01.cc
+++ b/tests/codim_one/error_estimator_01.cc
@@ -128,7 +128,7 @@ check ()
   Triangulation<dim,spacedim> tria;
   make_mesh (tria);
 
-  FE_Q<dim,spacedim> element(3);
+  FE_Q<dim,spacedim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim,spacedim> dof(tria);
   dof.distribute_dofs(element);
 
@@ -202,7 +202,7 @@ check ()
 int main ()
 {
   std::ofstream logfile ("output");
-  deallog << std::setprecision (4);
+  deallog << std::setprecision (2);
   deallog << std::fixed;
   deallog.attach(logfile);
 

diff --git a/tests/codim_one/gradients_1.cc b/tests/codim_one/gradients_1.cc
index 02af50856bd4788c385f90e2bb239ec7983f4934..06eb8036e7591d90247ccd6f7ad59193f5d73f09 100644 (file)
--- a/tests/codim_one/gradients_1.cc
+++ b/tests/codim_one/gradients_1.cc
@@ -63,7 +63,7 @@ void test(std::string filename, unsigned int degree = 1)
 
   // finite elements used for the
   // projection
-  const FE_Q<dim,spacedim> fe (degree);
+  const FE_Q<dim,spacedim> fe (QIterated<1>(QTrapez<1>(),degree));
   const MappingQ<dim, spacedim> mapping(degree);
 
   DoFHandler<dim,spacedim> dof_handler (triangulation);
@@ -133,4 +133,3 @@ int main ()
 
   return 0;
 }
-

diff --git a/tests/fe/derivatives.cc b/tests/fe/derivatives.cc
index 55ab2947387963c3b70c79ca2dbfbdbe04130307..e3ab65ee09dc8090235ec550415b0a655678dd44 100644 (file)
--- a/tests/fe/derivatives.cc
+++ b/tests/fe/derivatives.cc
@@ -88,10 +88,10 @@ void plot_FE_Q_shape_functions()
   FE_Q<dim> q2(2);
   plot_derivatives(m, q2, "Q2");
 //  plot_face_shape_functions(m, q2, "Q2");
-  FE_Q<dim> q3(3);
+  FE_Q<dim> q3(QIterated<1>(QTrapez<1>(),3));
   plot_derivatives(m, q3, "Q3");
 //  plot_face_shape_functions(m, q3, "Q3");
-  FE_Q<dim> q4(4);
+  FE_Q<dim> q4(QIterated<1>(QTrapez<1>(),4));
   plot_derivatives(m, q4, "Q4");
 //  plot_face_shape_functions(m, q4, "Q4");
 //    FE_Q<dim> q5(5);
@@ -119,10 +119,10 @@ void plot_FE_DGQ_shape_functions()
   FE_DGQ<dim> q2(2);
   plot_derivatives(m, q2, "DGQ2");
 //  plot_face_shape_functions(m, q2, "DGQ2");
-  FE_DGQ<dim> q3(3);
+  FE_DGQArbitraryNodes<dim> q3(QIterated<1>(QTrapez<1>(),3));
   plot_derivatives(m, q3, "DGQ3");
 //  plot_face_shape_functions(m, q3, "DGQ3");
-  FE_DGQ<dim> q4(4);
+  FE_DGQArbitraryNodes<dim> q4(QIterated<1>(QTrapez<1>(),4));
   plot_derivatives(m, q4, "DGQ4");
 //  plot_face_shape_functions(m, q4, "DGQ4");
 //    FE_DGQ<dim> q5(5);
@@ -165,7 +165,7 @@ main()
   // FESystem test.
   MappingQGeneric<2> m(1);
   FESystem<2> q2_q3(FE_Q<2>(2), 1,
-                    FE_Q<2>(3), 1);
+                    FE_Q<2>(QIterated<1>(QTrapez<1>(),3)), 1);
 //  plot_derivatives(m, q2_q3, "Q2_Q3");
 
   return 0;

diff --git a/tests/fe/fe_prolongation_sys_04.cc b/tests/fe/fe_prolongation_sys_04.cc
index 3d9e534d9ba83157ea990b0b51bbc45f10f46637..eac3b3be295ce50c9578bce713c3cb4e3abc3bf5 100644 (file)
--- a/tests/fe/fe_prolongation_sys_04.cc
+++ b/tests/fe/fe_prolongation_sys_04.cc
@@ -25,5 +25,5 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2);
+  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(QIterated<1>(QTrapez<1>(),3)),3,2);
 }

diff --git a/tests/fe/fe_prolongation_sys_05.cc b/tests/fe/fe_prolongation_sys_05.cc
index 9a508790badc2b1d439859dca93549cc6d00080d..95fb4f6fab3219d64ff8086bdeeb3a501d65e6d4 100644 (file)
--- a/tests/fe/fe_prolongation_sys_05.cc
+++ b/tests/fe/fe_prolongation_sys_05.cc
@@ -26,7 +26,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3,
-             FE_DGQ<2>(3), 1,
+             FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
              FE_Q<2>(1), 3,
              2);
 }

diff --git a/tests/fe/fe_prolongation_sys_06.cc b/tests/fe/fe_prolongation_sys_06.cc
index b86d958c7b5c8423f158eda0776a3f059ebd878f..7603ab4a1f4871db423ea1c9afbd747069a33686 100644 (file)
--- a/tests/fe/fe_prolongation_sys_06.cc
+++ b/tests/fe/fe_prolongation_sys_06.cc
@@ -25,8 +25,8 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(3), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
+  CHECK_SYS3(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
              FESystem<2>(FE_Q<2>(2),3,
                          FE_DGQ<2>(0),1),2,
              2);

diff --git a/tests/fe/fe_prolongation_sys_08.cc b/tests/fe/fe_prolongation_sys_08.cc
index 50fde1cc6ee07d7dd3df5401327daef10f7f1227..6b944d575b5981693195b2081990b35931010e83 100644 (file)
--- a/tests/fe/fe_prolongation_sys_08.cc
+++ b/tests/fe/fe_prolongation_sys_08.cc
@@ -26,7 +26,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3(FE_Nedelec<2>(0), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
              FESystem<2>(FE_Q<2>(2),3,
                          FE_Nedelec<2>(0),2),2,
              2);

diff --git a/tests/fe/fe_prolongation_sys_09.cc b/tests/fe/fe_prolongation_sys_09.cc
index 52a4f68bd62fc80933f01d2e2712587dd9fdc743..d31375caef389999523fdcb53397131ba251cd66 100644 (file)
--- a/tests/fe/fe_prolongation_sys_09.cc
+++ b/tests/fe/fe_prolongation_sys_09.cc
@@ -25,7 +25,7 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS2 (FE_DGQ<2>(3), 1,
+  CHECK_SYS2 (FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
               FE_Nedelec<2>(1), 2,
               2);
 }

diff --git a/tests/fe/fe_restriction_sys_04.cc b/tests/fe/fe_restriction_sys_04.cc
index 0ec770b93e081397de87ecd2ac26a5c6a84da64b..deabda2707f2c7304ac39921c1f7060aa975ffbb 100644 (file)
--- a/tests/fe/fe_restriction_sys_04.cc
+++ b/tests/fe/fe_restriction_sys_04.cc
@@ -25,5 +25,5 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2);
+  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(QIterated<1>(QTrapez<1>(),3)),3,2);
 }

diff --git a/tests/fe/fe_restriction_sys_05.cc b/tests/fe/fe_restriction_sys_05.cc
index 3edc85ffbf8cf7c476e4bde3ac6fe8eb27f6b145..fa9b8e9843ce10114eebd10605197f682d0ec1c4 100644 (file)
--- a/tests/fe/fe_restriction_sys_05.cc
+++ b/tests/fe/fe_restriction_sys_05.cc
@@ -26,7 +26,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3,
-             FE_DGQ<2>(3), 1,
+             FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
              FE_Q<2>(1), 3,
              2);
 }

diff --git a/tests/fe/fe_restriction_sys_06.cc b/tests/fe/fe_restriction_sys_06.cc
index 0b9d7544f2089d609316ef119d1cd02deaeff4ea..6c2be409c72c8a44a2a3c063939adf6db07b385c 100644 (file)
--- a/tests/fe/fe_restriction_sys_06.cc
+++ b/tests/fe/fe_restriction_sys_06.cc
@@ -25,8 +25,8 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(3), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
+  CHECK_SYS3(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
              FESystem<2>(FE_Q<2>(2),3,
                          FE_DGQ<2>(0),1),2,
              2);

diff --git a/tests/fe/fe_restriction_sys_07.cc b/tests/fe/fe_restriction_sys_07.cc
index c254b8270c61032bd5a353479422e3c649ce3b42..eb9c8173d51ea86b79b7af1d02d71b284a110184 100644 (file)
--- a/tests/fe/fe_restriction_sys_07.cc
+++ b/tests/fe/fe_restriction_sys_07.cc
@@ -25,7 +25,7 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS2 (FE_DGQ<2>(3), 1,
+  CHECK_SYS2 (FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
               FE_Nedelec<2>(0), 2,
               2);
 }

diff --git a/tests/fe/fe_restriction_sys_08.cc b/tests/fe/fe_restriction_sys_08.cc
index 701744203bf8650cf82059a1a85b50b6b6741d01..ca5a249947d8a6be577211a233837a79635e0531 100644 (file)
--- a/tests/fe/fe_restriction_sys_08.cc
+++ b/tests/fe/fe_restriction_sys_08.cc
@@ -26,7 +26,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3(FE_Nedelec<2>(0), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
              FESystem<2>(FE_Q<2>(2),3,
                          FE_Nedelec<2>(0),2),2,
              2);

diff --git a/tests/fe/fe_restriction_sys_09.cc b/tests/fe/fe_restriction_sys_09.cc
index 4ae768b83f8a3606b3bec20e349c230e0b3324e7..96df13f7752471f01a4ec5e90c9535919f971df1 100644 (file)
--- a/tests/fe/fe_restriction_sys_09.cc
+++ b/tests/fe/fe_restriction_sys_09.cc
@@ -25,7 +25,7 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS2 (FE_DGQ<2>(3), 1,
+  CHECK_SYS2 (FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
               FE_Nedelec<2>(1), 2,
               2);
 }

diff --git a/tests/fe/fe_restriction_sys_10.cc b/tests/fe/fe_restriction_sys_10.cc
index 7ac6b0b40753dfcb4e358cfb933dfe95fc59c1bb..9e978650e7b819ad88fece4b0261778d0ee9a247 100644 (file)
--- a/tests/fe/fe_restriction_sys_10.cc
+++ b/tests/fe/fe_restriction_sys_10.cc
@@ -25,7 +25,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3(FE_Nedelec<2>(1), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
              FESystem<2>(FE_Q<2>(2),3,
                          FE_Nedelec<2>(1),2),2,
              2);

diff --git a/tests/fe/fe_support_points_sys_04.cc b/tests/fe/fe_support_points_sys_04.cc
index ae6c7364e298820d3efe1e670b5d002d8b42edab..00b161ab6cd5db28be287c7a7e915573b229803e 100644 (file)
--- a/tests/fe/fe_support_points_sys_04.cc
+++ b/tests/fe/fe_support_points_sys_04.cc
@@ -25,5 +25,5 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2);
+  CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(QIterated<1>(QTrapez<1>(),3)),3,2);
 }

diff --git a/tests/fe/fe_support_points_sys_05.cc b/tests/fe/fe_support_points_sys_05.cc
index cb5c6ef52e712870367148f379aa07aea2e12d3a..2341ec998d441b7c2dcc929bf591700a2353eeb3 100644 (file)
--- a/tests/fe/fe_support_points_sys_05.cc
+++ b/tests/fe/fe_support_points_sys_05.cc
@@ -26,7 +26,7 @@ main()
   deallog.threshold_double(1.e-10);
 
   CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3,
-             FE_DGQ<2>(3), 1,
+             FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
              FE_Q<2>(1), 3,
              2);
 }

diff --git a/tests/fe/fe_support_points_sys_06.cc b/tests/fe/fe_support_points_sys_06.cc
index d32cdd562381365e3c06a327749feebfc0849b20..78df37c40a0f1c39f5c563bc0f875e1d8ecdf290 100644 (file)
--- a/tests/fe/fe_support_points_sys_06.cc
+++ b/tests/fe/fe_support_points_sys_06.cc
@@ -25,9 +25,9 @@ main()
   initlog();
   deallog.threshold_double(1.e-10);
 
-  CHECK_SYS3(FE_DGQ<2>(3), 1,
-             FESystem<2>(FE_DGQ<2>(3),3), 1,
-             FESystem<2>(FE_Q<2>(2),3,
+  CHECK_SYS3(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)), 1,
+             FESystem<2>(FE_DGQArbitraryNodes<2>(QIterated<1>(QTrapez<1>(),3)),3), 1,
+             FESystem<2>(FE_Q<2>(QIterated<1>(QTrapez<1>(),2)),3,
                          FE_DGQ<2>(0),1),2,
              2);
 }

diff --git a/tests/fe/fe_values_view_01.cc b/tests/fe/fe_values_view_01.cc
index aefce3148b6c32f77086104d9b215ca19a07bf6d..54693ec65e354ba496deda448713c941a7c935e1 100644 (file)
--- a/tests/fe/fe_values_view_01.cc
+++ b/tests/fe/fe_values_view_01.cc
@@ -99,7 +99,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_02.cc b/tests/fe/fe_values_view_02.cc
index e0e93d372ee6dbd4e6e6c40edfd107092973ffb5..5ef900daa1e4184fd75987c9dc8a11bfd392ad49 100644 (file)
--- a/tests/fe/fe_values_view_02.cc
+++ b/tests/fe/fe_values_view_02.cc
@@ -124,7 +124,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_05.cc b/tests/fe/fe_values_view_05.cc
index 71abeedea09891c77b7b5d6ad7fdca704719c5ca..9a4987d0426d08cfb94970ee1a2ac9ce87cc2e07 100644 (file)
--- a/tests/fe/fe_values_view_05.cc
+++ b/tests/fe/fe_values_view_05.cc
@@ -91,7 +91,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_07.cc b/tests/fe/fe_values_view_07.cc
index 1b5cc7d9856df74c9701742a126ab94771a3ece0..e74dd412ad800e7b3a00f757a1d814b9c370245c 100644 (file)
--- a/tests/fe/fe_values_view_07.cc
+++ b/tests/fe/fe_values_view_07.cc
@@ -92,7 +92,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_11.cc b/tests/fe/fe_values_view_11.cc
index 21fdd4c1613a383fde3292fd369ff064e30def84..59edd51a1aa5948ef94a4062e3a826672b928c33 100644 (file)
--- a/tests/fe/fe_values_view_11.cc
+++ b/tests/fe/fe_values_view_11.cc
@@ -97,7 +97,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_13.cc b/tests/fe/fe_values_view_13.cc
index cd105c095351bc1fdc3724f3eb46e7a51c0d16d6..459bdf0238afb6794a6b3d93d8365030650b397a 100644 (file)
--- a/tests/fe/fe_values_view_13.cc
+++ b/tests/fe/fe_values_view_13.cc
@@ -98,7 +98,7 @@ void test_hyper_sphere()
 
   FESystem<dim> fe (FE_Q<dim>(1), 1,
                     FE_Q<dim>(2), 2,
-                    FE_DGQ<dim>(3), dim);
+                    FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),3)), dim);
   test(tr, fe);
 }
 

diff --git a/tests/fe/fe_values_view_30.cc b/tests/fe/fe_values_view_30.cc
index 3c6f6c0197b92166d50e0d6f8eddc634d7eadb81..d7d069b92fc8eb7d417db0d5ccd7ac546bfb2472 100644 (file)
--- a/tests/fe/fe_values_view_30.cc
+++ b/tests/fe/fe_values_view_30.cc
@@ -170,7 +170,7 @@ void test_hyper_sphere()
 
   const unsigned int order = 3;
 
-  test(tr, FESystem<dim> (FE_Q<dim>(order), dim) );
+  test(tr, FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),order)), dim) );
 }
 
 

diff --git a/tests/fe/injection_dgq.cc b/tests/fe/injection_dgq.cc
index 3dcbb52d24953e2d925de6b0d584cd08a029f6a5..cd6ab82b1d30ae55c7577be73c2addaef89d1b04 100644 (file)
--- a/tests/fe/injection_dgq.cc
+++ b/tests/fe/injection_dgq.cc
@@ -17,6 +17,7 @@
 
 char logname[] = "output";
 
+#include <deal.II/base/quadrature_lib.h>
 
 #include "injection_common.h"
 
@@ -28,5 +29,13 @@ void test ()
 
   for (unsigned int i=0; i<4; ++i)
     for (unsigned int j=i; j<4; ++j)
-      do_check (FE_DGQ<dim>(i), FE_DGQ<dim>(j));
+      if (i > 0 && j > 0)
+        do_check (FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),i)),
+                  FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),j)));
+      else if (j > 0)
+        do_check (FE_DGQ<dim>(0),
+                  FE_DGQArbitraryNodes<dim>(QIterated<1>(QTrapez<1>(),j)));
+      else
+        do_check (FE_DGQ<dim>(0),
+                  FE_DGQ<dim>(0));
 }

diff --git a/tests/fe/injection_q.cc b/tests/fe/injection_q.cc
index a6639e0cbd8478dab85ecfed5e3ec009b833f47f..ba8799a76b1d124d3fffada8d6b2e08d2e266db2 100644 (file)
--- a/tests/fe/injection_q.cc
+++ b/tests/fe/injection_q.cc
@@ -17,6 +17,7 @@
 
 char logname[] = "output";
 
+#include <deal.II/base/quadrature_lib.h>
 
 #include "injection_common.h"
 
@@ -27,5 +28,6 @@ void test ()
   deallog << std::setprecision (10);
   for (unsigned int i=1; i<4; ++i)
     for (unsigned int j=i; j<4; ++j)
-      do_check (FE_Q<dim>(i), FE_Q<dim>(j));
+      do_check (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),
+                FE_Q<dim>(QIterated<1>(QTrapez<1>(),j)));
 }

diff --git a/tests/fe/injection_q_dg0.cc b/tests/fe/injection_q_dg0.cc
index 50ecae0f21dad42fdc410a3de8fc8b4c8a942093..8459ec15cf38d649a13de7f3c5a8a2f05bd59e7f 100644 (file)
--- a/tests/fe/injection_q_dg0.cc
+++ b/tests/fe/injection_q_dg0.cc
@@ -17,9 +17,11 @@
 
 char logname[] = "output";
 
+#include <deal.II/base/quadrature_lib.h>
 
 #include "injection_common.h"
 
+
 template <int dim>
 void test ()
 {
@@ -28,6 +30,7 @@ void test ()
     for (unsigned int j=i; j<4; ++j)
       {
         deallog << "inj " << i << " " << j << ":" << std::endl;
-        do_check (FE_Q_DG0<dim>(i), FE_Q_DG0<dim>(j));
+        do_check (FE_Q_DG0<dim>(QIterated<1>(QTrapez<1>(),i)),
+                  FE_Q_DG0<dim>(QIterated<1>(QTrapez<1>(),j)));
       }
 }

diff --git a/tests/fe/injection_q_system.cc b/tests/fe/injection_q_system.cc
index 5ea40e65b753849cb02dca692a3b5ee9a8b6f225..7fe7f806f35c117919d816001ed516c56e45b019 100644 (file)
--- a/tests/fe/injection_q_system.cc
+++ b/tests/fe/injection_q_system.cc
@@ -17,6 +17,7 @@
 
 char logname[] = "output";
 
+#include <deal.II/base/quadrature_lib.h>
 
 #include "injection_common.h"
 
@@ -28,8 +29,8 @@ void test ()
 
   for (unsigned int i=1; i<4; ++i)
     for (unsigned int j=i; j<4; ++j)
-      do_check (FESystem<dim>(FE_Q<dim>(i), 1,
+      do_check (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
                               FE_DGQ<dim>(i-1), 1),
-                FESystem<dim>(FE_Q<dim>(j), 1,
+                FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),j)), 1,
                               FE_DGQ<dim>(j-1), 1));
 }

diff --git a/tests/fe/q_1.cc b/tests/fe/q_1.cc
index 5fd222ae358b4089d99e5a545bed279c85fa792e..61e69adf3e1076a6c2f0b4b1d5efa887a027980a 100644 (file)
--- a/tests/fe/q_1.cc
+++ b/tests/fe/q_1.cc
@@ -62,26 +62,18 @@ main()
   deallog.attach(logfile);
   deallog.threshold_double(1.e-10);
 
-
-  // Test the non-equidistant version as
-  // well
-  const QGaussLobatto<1> quad(5);
-
-  // no constraints in 1d, but we had
-  // the matrices precomputed up to
-  // Q4 for 2d and Q2 for 3d
+  // no constraints in 1d, but we had the matrices precomputed up to Q4 for 2d
+  // and Q2 for 3d
   for (unsigned int degree=1; degree<=4; ++degree)
-    test<2>(FE_Q<2>(degree));
+    test<2>(FE_Q<2>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<2>(FE_Q<2>(quad));
+  // test the standard version (non-equidistant) as well
+  test<2>(FE_Q<2>(4));
 
   for (unsigned int degree=1; degree<=2; ++degree)
     test<3>(FE_Q<3>(degree));
 
-  test<3>(FE_Q<3>(quad));
+  test<3>(FE_Q<3>(4));
 
   return 0;
 }
-
-
-

diff --git a/tests/fe/q_2.cc b/tests/fe/q_2.cc
index 326c984d4b2d29e38383616f2475181af0b282b6..98b65f02030251fc2882a37fb13c58f8de36e0cf 100644 (file)
--- a/tests/fe/q_2.cc
+++ b/tests/fe/q_2.cc
@@ -67,30 +67,22 @@ main()
   deallog.attach(logfile);
   deallog.threshold_double(1.e-10);
 
-  // Test the non-equidistant version as
-  // well
-  const QGaussLobatto<1> quad(5);
-
-  // we had the matrices precomputed
-  // up to Q4 for 1d, Q3 for 2d and
-  // Q2 for 3d
+  // we had the matrices precomputed up to Q4 for 1d, Q3 for 2d and Q2 for 3d
   for (unsigned int degree=1; degree<=4; ++degree)
-    test<1>(FE_Q<1>(degree));
+    test<1>(FE_Q<1>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<1>(FE_Q<1>(quad));
+  // test the standard version (non-equidistant) as well
+  test<1>(FE_Q<1>(4));
 
   for (unsigned int degree=1; degree<=3; ++degree)
-    test<2>(FE_Q<2>(degree));
+    test<2>(FE_Q<2>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<2>(FE_Q<2>(quad));
+  test<2>(FE_Q<2>(4));
 
   for (unsigned int degree=1; degree<=2; ++degree)
     test<3>(FE_Q<3>(degree));
 
-  test<3>(FE_Q<3>(quad));
+  test<3>(FE_Q<3>(4));
 
   return 0;
 }
-
-
-

diff --git a/tests/fe/q_3.cc b/tests/fe/q_3.cc
index 5f97f7bcb19f33f79462b21ea0bd422704250540..84095ebd43103368a5fc7d3525fc1cccd6a5ca16 100644 (file)
--- a/tests/fe/q_3.cc
+++ b/tests/fe/q_3.cc
@@ -64,29 +64,22 @@ main()
   deallog.attach(logfile);
   deallog.threshold_double(1.e-10);
 
-  // Test the non-equidistant version as
-  // well
-  const QGaussLobatto<1> quad(5);
-
-  // we had the matrices precomputed
-  // up to Q4 for 1d, 2d and 3d
+  // we had the matrices precomputed up to Q4 for 1d, 2d and 3d
   for (unsigned int degree=1; degree<=4; ++degree)
-    test<1>(FE_Q<1>(degree));
+    test<1>(FE_Q<1>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<1>(FE_Q<1>(quad));
+  // test the standard version (non-equidistant) as well
+  test<1>(FE_Q<1>(4));
 
   for (unsigned int degree=1; degree<=4; ++degree)
-    test<2>(FE_Q<2>(degree));
+    test<2>(FE_Q<2>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<2>(FE_Q<2>(quad));
+  test<2>(FE_Q<2>(4));
 
   for (unsigned int degree=1; degree<=4; ++degree)
-    test<3>(FE_Q<3>(degree));
+    test<3>(FE_Q<3>(QIterated<1>(QTrapez<1>(),degree)));
 
-  test<3>(FE_Q<3>(quad));
+  test<3>(FE_Q<3>(4));
 
   return 0;
 }
-
-
-

diff --git a/tests/fe/q_4.cc b/tests/fe/q_4.cc
index a11926a17406d8ce9d30340946a01790ba412721..cd86cc25946dedad66fe9446bdd8be4d75445ac4 100644 (file)
--- a/tests/fe/q_4.cc
+++ b/tests/fe/q_4.cc
@@ -69,7 +69,8 @@ main()
 
   for (unsigned int degree1=1; degree1<=4; ++degree1)
     for (unsigned int degree2=1; degree2<=4; ++degree2)
-      test<1>(FE_Q<1>(degree1), FE_Q<1>(degree2));
+      test<1>(FE_Q<1>(QIterated<1>(QTrapez<1>(),degree1)),
+              FE_Q<1>(QIterated<1>(QTrapez<1>(),degree2)));
   for (unsigned int degree1=2; degree1<=5; ++degree1)
     for (unsigned int degree2=2; degree2<=5; ++degree2)
       test<1>(FE_Q<1>(QGaussLobatto<1>(degree1)),
@@ -77,7 +78,8 @@ main()
 
   for (unsigned int degree1=1; degree1<=3; ++degree1)
     for (unsigned int degree2=1; degree2<=3; ++degree2)
-      test<2>(FE_Q<2>(degree1), FE_Q<2>(degree2));
+      test<2>(FE_Q<2>(QIterated<1>(QTrapez<1>(),degree1)),
+              FE_Q<2>(QIterated<1>(QTrapez<1>(),degree2)));
   for (unsigned int degree1=2; degree1<=4; ++degree1)
     for (unsigned int degree2=2; degree2<=4; ++degree2)
       test<2>(FE_Q<2>(QGaussLobatto<1>(degree1)),
@@ -85,7 +87,8 @@ main()
 
   for (unsigned int degree1=1; degree1<=2; ++degree1)
     for (unsigned int degree2=1; degree2<=2; ++degree2)
-      test<3>(FE_Q<3>(degree1), FE_Q<3>(degree2));
+      test<3>(FE_Q<3>(QIterated<1>(QTrapez<1>(),degree1)),
+              FE_Q<3>(QIterated<1>(QTrapez<1>(),degree2)));
   for (unsigned int degree1=2; degree1<=4; ++degree1)
     for (unsigned int degree2=2; degree2<=4; ++degree2)
       test<3>(FE_Q<3>(QGaussLobatto<1>(degree1)),
@@ -94,6 +97,3 @@ main()
 
   return 0;
 }
-
-
-

diff --git a/tests/fe/q_bubbles_projection_01.cc b/tests/fe/q_bubbles_projection_01.cc
index d4821a4ec0dc69bcf35a2413cb9504434c11edad..2dcb306165f30f7266e9fd2ca88c6aec700db86b 100644 (file)
--- a/tests/fe/q_bubbles_projection_01.cc
+++ b/tests/fe/q_bubbles_projection_01.cc
@@ -29,6 +29,6 @@ char logname[] = "output";
 
 void test ()
 {
-  FESystem<2> fe (FE_Q_Bubbles<2>(3), 2);
+  FESystem<2> fe (FE_Q_Bubbles<2>(QIterated<1>(QTrapez<1>(),3)), 2);
   check (fe);
 }

diff --git a/tests/fe/shapes_dgq.cc b/tests/fe/shapes_dgq.cc
index 86ec292130f3e061720eaf42102b176226dfca63..204f1b2233159859480bd765630592e85c5c6936 100644 (file)
--- a/tests/fe/shapes_dgq.cc
+++ b/tests/fe/shapes_dgq.cc
@@ -39,13 +39,12 @@ void plot_FE_DGQ_shape_functions()
   plot_face_shape_functions(m, q2, "DGQ2");
   test_compute_functions(m, q2, "DGQ2");
 
-  FE_DGQ<dim> q3(3);
+  FE_DGQArbitraryNodes<dim> q3(QIterated<1>(QTrapez<1>(),3));
   plot_shape_functions(m, q3, "DGQ3");
   plot_face_shape_functions(m, q3, "DGQ3");
   test_compute_functions(m, q3, "DGQ3");
 
-  QGaussLobatto<1> quadrature_gl(5);
-  FE_DGQArbitraryNodes<dim> qgl(quadrature_gl);
+  FE_DGQ<dim> qgl(4);
   plot_shape_functions(m, qgl, "DGQGL");
   plot_face_shape_functions(m, qgl, "DGQGL");
   test_compute_functions(m, qgl, "DGQGL");

diff --git a/tests/fe/shapes_q.cc b/tests/fe/shapes_q.cc
index 4f983191c8bc53606db0eff52cf76436a844505f..d76a7ebd068456d75496d9426ee644daa6ef0aaf 100644 (file)
--- a/tests/fe/shapes_q.cc
+++ b/tests/fe/shapes_q.cc
@@ -43,12 +43,12 @@ void plot_FE_Q_shape_functions()
   // reduce run-time
   if (dim < 3)
     {
-      FE_Q<dim> q3(3);
+      FE_Q<dim> q3(QIterated<1>(QTrapez<1>(),3));
       plot_shape_functions(m, q3, "Q3");
       plot_face_shape_functions(m, q3, "Q3");
       test_compute_functions(m, q3, "Q3");
 
-      FE_Q<dim> q4(4);
+      FE_Q<dim> q4(QIterated<1>(QTrapez<1>(),4));
       plot_shape_functions(m, q4, "Q4");
       plot_face_shape_functions(m, q4, "Q4");
       test_compute_functions(m, q4, "Q4");

diff --git a/tests/fe/shapes_q_bubbles.cc b/tests/fe/shapes_q_bubbles.cc
index c82ad0bba5424cfa0a23e230eda5ed6490300b9b..90254cf5e921a51e3f99854d649051435a5d5a04 100644 (file)
--- a/tests/fe/shapes_q_bubbles.cc
+++ b/tests/fe/shapes_q_bubbles.cc
@@ -44,12 +44,12 @@ void plot_FE_Q_Bubbles_shape_functions()
   // reduce run-time
   if (dim < 3)
     {
-      FE_Q_Bubbles<dim> q3(3);
+      FE_Q_Bubbles<dim> q3(QIterated<1>(QTrapez<1>(),3));
       plot_shape_functions(m, q3, "Q3_Bubbles");
       plot_face_shape_functions(m, q3, "Q3_Bubbles");
       test_compute_functions(m, q3, "Q3_Bubbles");
 
-      FE_Q_Bubbles<dim> q4(4);
+      FE_Q_Bubbles<dim> q4(QIterated<1>(QTrapez<1>(),4));
       plot_shape_functions(m, q4, "Q4_Bubbles");
       plot_face_shape_functions(m, q4, "Q4_Bubbles");
       test_compute_functions(m, q4, "Q4_Bubbles");

diff --git a/tests/fe/shapes_q_dg0.cc b/tests/fe/shapes_q_dg0.cc
index 42d001a50cfc8acefb47c06de7def47debb5af88..ca94ca00321abe08a560cdd54a97a9119f21dbac 100644 (file)
--- a/tests/fe/shapes_q_dg0.cc
+++ b/tests/fe/shapes_q_dg0.cc
@@ -43,12 +43,12 @@ void plot_FE_Q_DG0_shape_functions()
   // reduce run-time
   if (dim < 3)
     {
-      FE_Q_DG0<dim> q3(3);
+      FE_Q_DG0<dim> q3(QIterated<1>(QTrapez<1>(),3));
       plot_shape_functions(m, q3, "Q3_DG0");
       plot_face_shape_functions(m, q3, "Q3_DG0");
       test_compute_functions(m, q3, "Q3_DG0");
 
-      FE_Q_DG0<dim> q4(4);
+      FE_Q_DG0<dim> q4(QIterated<1>(QTrapez<1>(),4));
       plot_shape_functions(m, q4, "Q4_DG0");
       plot_face_shape_functions(m, q4, "Q4_DG0");
       test_compute_functions(m, q4, "Q4_DG0");

diff --git a/tests/grid/mesh_3d_25.cc b/tests/grid/mesh_3d_25.cc
index e1601b507004cb8f0f7dc9f0c885a05ea0531b5b..4c1b74be7542302730f13b7c5f6d38e0d7d565d6 100644 (file)
--- a/tests/grid/mesh_3d_25.cc
+++ b/tests/grid/mesh_3d_25.cc
@@ -119,4 +119,3 @@ int main ()
   create_two_cubes_rotation(triangulation,1);
   test<3>(triangulation);
 }
-

diff --git a/tests/grid/mesh_3d_26.cc b/tests/grid/mesh_3d_26.cc
index 43279b492cb1ae501db1cca1269a8e8e7ba84fb4..60e48f0cb01b9d7730625578b15f45a82c485670 100644 (file)
--- a/tests/grid/mesh_3d_26.cc
+++ b/tests/grid/mesh_3d_26.cc
@@ -121,4 +121,3 @@ int main ()
   triangulation.refine_global(1);
   test<3>(triangulation);
 }
-

diff --git a/tests/hp/crash_08.cc b/tests/hp/crash_08.cc
index 0a0ffd3714f2b476c5ed38b5ab59d58ebaeff0e0..8cb9a3934a1f5c5ddad37300e87aade76fe6f1a8 100644 (file)
--- a/tests/hp/crash_08.cc
+++ b/tests/hp/crash_08.cc
@@ -70,7 +70,7 @@ int main ()
   hp::FECollection<2> fe;
   fe.push_back (FE_Q<2>(1));
   fe.push_back (FE_Q<2>(2));
-  fe.push_back (FE_Q<2>(3));
+  fe.push_back (FE_Q<2>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<2>        dof_handler(triangulation);
 
@@ -152,4 +152,3 @@ int main ()
 
   constraints.print (deallog.get_file_stream());
 }
-

diff --git a/tests/hp/crash_09.cc b/tests/hp/crash_09.cc
index b5c7a634733ecd7ef4d47bfa5432092a72061c40..8d0e1f7b21621ade66874a740c9e9d2b2fa65517 100644 (file)
--- a/tests/hp/crash_09.cc
+++ b/tests/hp/crash_09.cc
@@ -71,7 +71,7 @@ int main ()
   hp::FECollection<3> fe;
   fe.push_back (FE_Q<3>(1));
   fe.push_back (FE_Q<3>(2));
-  fe.push_back (FE_Q<3>(3));
+  fe.push_back (FE_Q<3>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<3>        dof_handler(triangulation);
 
@@ -144,4 +144,3 @@ done:
 
   constraints.print (deallog.get_file_stream());
 }
-

diff --git a/tests/hp/crash_10.cc b/tests/hp/crash_10.cc
index 18b422fffd0e98a8dc25132fa0308f2baf55b40f..207ecde47ef8f151a2041db5bff2ec228b53d330 100644 (file)
--- a/tests/hp/crash_10.cc
+++ b/tests/hp/crash_10.cc
@@ -30,6 +30,7 @@
 #include <deal.II/dofs/dof_accessor.h>
 
 #include <deal.II/fe/fe_q.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <deal.II/dofs/dof_tools.h>
 
@@ -46,7 +47,7 @@ void test ()
   hp::DoFHandler<dim>        dof_handler(triangulation);
   ConstraintMatrix     hanging_node_constraints;
 
-  FE_Q<dim> fe_1 (1), fe_2 (2), fe_3 (3), fe_4 (4);
+  FE_Q<dim> fe_1 (1), fe_2 (2), fe_3 (QIterated<1>(QTrapez<1>(),3)), fe_4 (QIterated<1>(QTrapez<1>(),4));
 
   fe.push_back (fe_1);
   fe.push_back (fe_2);

diff --git a/tests/hp/crash_11.cc b/tests/hp/crash_11.cc
index 291c360f86cebdf7701df5d7ea98c6333f47a94b..532071f6f9fb2be82f22576dd3f61783d52c9d32 100644 (file)
--- a/tests/hp/crash_11.cc
+++ b/tests/hp/crash_11.cc
@@ -71,8 +71,8 @@ int main ()
   hp::FECollection<3> fe;
   fe.push_back (FE_Q<3>(1));
   fe.push_back (FE_Q<3>(2));
-  fe.push_back (FE_Q<3>(3));
-  fe.push_back (FE_Q<3>(4));
+  fe.push_back (FE_Q<3>(QIterated<1>(QTrapez<1>(),3)));
+  fe.push_back (FE_Q<3>(QIterated<1>(QTrapez<1>(),4)));
 
   hp::DoFHandler<3>        dof_handler(triangulation);
 
@@ -131,4 +131,3 @@ done:
 
   constraints.print (deallog.get_file_stream());
 }
-

diff --git a/tests/hp/crash_12.cc b/tests/hp/crash_12.cc
index 38b8cfd6c75f0543697cf069663a839f127aa69a..9fd6be945c5f8a58ce6fe0defd7f5706907484a7 100644 (file)
--- a/tests/hp/crash_12.cc
+++ b/tests/hp/crash_12.cc
@@ -75,9 +75,9 @@ void test ()
   hp::FECollection<dim> fe;
   fe.push_back (FE_Q<dim>(1));
   fe.push_back (FE_Q<dim>(2));
-  fe.push_back (FE_Q<dim>(3));
-  fe.push_back (FE_Q<dim>(4));
-  fe.push_back (FE_Q<dim>(5));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)));
+  fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),5)));
 
   hp::DoFHandler<dim>        dof_handler(triangulation);
 
@@ -123,4 +123,3 @@ int main ()
   test<2> ();
   test<3> ();
 }
-

diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc
index f765e448d51e39f66e8642e5fc919fcba1596d65..6cd7858525c7a06db8ed186ae3239fac0222172e 100644 (file)
--- a/tests/hp/crash_17.cc
+++ b/tests/hp/crash_17.cc
@@ -131,7 +131,7 @@ LaplaceProblem<dim>::LaplaceProblem () :
 {
   for (unsigned int degree=2; degree<5; ++degree)
     {
-      fe_collection.push_back (FE_Q<dim>(degree));
+      fe_collection.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)));
       quadrature_collection.push_back (QGauss<dim>(degree+2));
       face_quadrature_collection.push_back (QGauss<dim-1>(degree+2));
     }

diff --git a/tests/hp/crash_17_compressed_set_sparsity.cc b/tests/hp/crash_17_compressed_set_sparsity.cc
index 27d19dd88c0a518e31c51ac62484230418dd19d0..90b6d89795b31e064f879b04b1bfab935c9fb078 100644 (file)
--- a/tests/hp/crash_17_compressed_set_sparsity.cc
+++ b/tests/hp/crash_17_compressed_set_sparsity.cc
@@ -133,7 +133,7 @@ LaplaceProblem<dim>::LaplaceProblem () :
 {
   for (unsigned int degree=2; degree<5; ++degree)
     {
-      fe_collection.push_back (FE_Q<dim>(degree));
+      fe_collection.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)));
       quadrature_collection.push_back (QGauss<dim>(degree+2));
       face_quadrature_collection.push_back (QGauss<dim-1>(degree+2));
     }

diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc
index 71e86ea9d51f621a347ba4a01bdf8b611a61e40c..d19b78964e871ec01d13515d04a2cc78614d5500 100644 (file)
--- a/tests/hp/crash_18.cc
+++ b/tests/hp/crash_18.cc
@@ -134,7 +134,7 @@ LaplaceProblem<dim>::LaplaceProblem () :
 {
   for (unsigned int degree=2; degree<5; ++degree)
     {
-      fe_collection.push_back (FE_Q<dim>(degree));
+      fe_collection.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)));
       quadrature_collection.push_back (QGauss<dim>(degree+2));
       face_quadrature_collection.push_back (QGauss<dim-1>(degree+2));
     }

diff --git a/tests/hp/crash_18_compressed_set_sparsity.cc b/tests/hp/crash_18_compressed_set_sparsity.cc
index a6f29f96ddc3b5647f40ea4e4bd1f148ddfc986d..db87cee5a4b9e40982177a545df761befe8eded3 100644 (file)
--- a/tests/hp/crash_18_compressed_set_sparsity.cc
+++ b/tests/hp/crash_18_compressed_set_sparsity.cc
@@ -137,7 +137,7 @@ LaplaceProblem<dim>::LaplaceProblem () :
 {
   for (unsigned int degree=2; degree<5; ++degree)
     {
-      fe_collection.push_back (FE_Q<dim>(degree));
+      fe_collection.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)));
       quadrature_collection.push_back (QGauss<dim>(degree+2));
       face_quadrature_collection.push_back (QGauss<dim-1>(degree+2));
     }

diff --git a/tests/hp/create_laplace_matrix_01.cc b/tests/hp/create_laplace_matrix_01.cc
index a0a081d8d3bf6392c7934d8cac9d6343e8575960..93e60c147e2cd0e5b8b93bdd690735f8452f9a89 100644 (file)
--- a/tests/hp/create_laplace_matrix_01.cc
+++ b/tests/hp/create_laplace_matrix_01.cc
@@ -72,7 +72,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_01b.cc b/tests/hp/create_laplace_matrix_01b.cc
index a91c38e3425a63284fb812344e1cbf9a2f62344b..0b434dbeb1c78477b705d48860fc932047c027bd 100644 (file)
--- a/tests/hp/create_laplace_matrix_01b.cc
+++ b/tests/hp/create_laplace_matrix_01b.cc
@@ -73,7 +73,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_02.cc b/tests/hp/create_laplace_matrix_02.cc
index a77b9f6688c7238420a65ac50a0764ede83dd4c0..bc357476d08ec6add8e8fd0c0a579a6392adce1b 100644 (file)
--- a/tests/hp/create_laplace_matrix_02.cc
+++ b/tests/hp/create_laplace_matrix_02.cc
@@ -72,9 +72,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_02b.cc b/tests/hp/create_laplace_matrix_02b.cc
index 23319b6eeb045b16a0a1c5c3fe93af804fe8f756..951fadc82d616fa41942f488c314ebfcc46d3ff6 100644 (file)
--- a/tests/hp/create_laplace_matrix_02b.cc
+++ b/tests/hp/create_laplace_matrix_02b.cc
@@ -73,9 +73,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_03.cc b/tests/hp/create_laplace_matrix_03.cc
index 6358d720211c50af9bfa3abdb36ab63091a8dd02..c02947e15229c767991dde3f1bd823f560de8241 100644 (file)
--- a/tests/hp/create_laplace_matrix_03.cc
+++ b/tests/hp/create_laplace_matrix_03.cc
@@ -71,7 +71,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_03b.cc b/tests/hp/create_laplace_matrix_03b.cc
index d917fa7f25645de918ff130be35ec877824dda92..374f0b40acf99ec4bae6133ebc946a6a908325dc 100644 (file)
--- a/tests/hp/create_laplace_matrix_03b.cc
+++ b/tests/hp/create_laplace_matrix_03b.cc
@@ -72,7 +72,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_04.cc b/tests/hp/create_laplace_matrix_04.cc
index cebd9e42f0d776ba337f019189f3c7a77d88897c..e2630fff5bc1bc20f2b3acfd483c4ec98447205e 100644 (file)
--- a/tests/hp/create_laplace_matrix_04.cc
+++ b/tests/hp/create_laplace_matrix_04.cc
@@ -71,9 +71,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_laplace_matrix_04b.cc b/tests/hp/create_laplace_matrix_04b.cc
index 3fd34264e95c4469cdd4f27a5a6371b86b282c32..970844ef7f95aa6ca9d498a76fb577ac318e946b 100644 (file)
--- a/tests/hp/create_laplace_matrix_04b.cc
+++ b/tests/hp/create_laplace_matrix_04b.cc
@@ -72,9 +72,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_01.cc b/tests/hp/create_mass_matrix_01.cc
index d61daa8c9549ecf6827f442922523848746b7703..9de1d7cbbcaedb51f412f1c15c8853c34ace1c64 100644 (file)
--- a/tests/hp/create_mass_matrix_01.cc
+++ b/tests/hp/create_mass_matrix_01.cc
@@ -72,7 +72,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_01b.cc b/tests/hp/create_mass_matrix_01b.cc
index 047ff435c422bedf64837599d816737cbbaeb8aa..54f8a42bac2f6145fceddff53210b8c07a8d52e0 100644 (file)
--- a/tests/hp/create_mass_matrix_01b.cc
+++ b/tests/hp/create_mass_matrix_01b.cc
@@ -73,7 +73,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_02.cc b/tests/hp/create_mass_matrix_02.cc
index e11ce5261a87c6e3179b282955d0272904a3a90c..a9df35dcdfd23677d035670c48d4baa0f97c7726 100644 (file)
--- a/tests/hp/create_mass_matrix_02.cc
+++ b/tests/hp/create_mass_matrix_02.cc
@@ -72,9 +72,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_02b.cc b/tests/hp/create_mass_matrix_02b.cc
index 9a47b12a1820aa3c808fca6384c83cb3b3d959f6..3ae8d86c0efd9f14928af484465519f95127f7fe 100644 (file)
--- a/tests/hp/create_mass_matrix_02b.cc
+++ b/tests/hp/create_mass_matrix_02b.cc
@@ -73,9 +73,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_03.cc b/tests/hp/create_mass_matrix_03.cc
index 69c5342357da40df0b2110a2e4e6eedcf4f82e00..f090c585dd8dc330c06efab3a69b092f985b684e 100644 (file)
--- a/tests/hp/create_mass_matrix_03.cc
+++ b/tests/hp/create_mass_matrix_03.cc
@@ -71,7 +71,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_03b.cc b/tests/hp/create_mass_matrix_03b.cc
index 0fed9b46e5974307c698d7a8b5eab08b9145b15e..f5215463f3d44eb05e4d653da15539871bc501be 100644 (file)
--- a/tests/hp/create_mass_matrix_03b.cc
+++ b/tests/hp/create_mass_matrix_03b.cc
@@ -74,7 +74,7 @@ check ()
   hp::FECollection<dim> element;
   element.push_back (FE_Q<dim>(1));
   element.push_back (FE_Q<dim>(2));
-  element.push_back (FE_Q<dim>(3));
+  element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_04.cc b/tests/hp/create_mass_matrix_04.cc
index 83743c41b8efd4931fe07bcbdef09057d30f92f0..e3443cb867c5930f20fe21d62821e719b0801d1b 100644 (file)
--- a/tests/hp/create_mass_matrix_04.cc
+++ b/tests/hp/create_mass_matrix_04.cc
@@ -71,9 +71,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_mass_matrix_04b.cc b/tests/hp/create_mass_matrix_04b.cc
index 61ff91d0f4a89ad19c49893951c45392fbb2a6d3..0f24084f5971bf807392f61c96aff815a87f8a79 100644 (file)
--- a/tests/hp/create_mass_matrix_04b.cc
+++ b/tests/hp/create_mass_matrix_04b.cc
@@ -72,9 +72,9 @@ check ()
   element.push_back (FESystem<dim> (FE_Q<dim>(1), 1,
                                     FE_Q<dim>(2), 1));
   element.push_back (FESystem<dim> (FE_Q<dim>(2), 1,
-                                    FE_Q<dim>(3), 1));
-  element.push_back (FESystem<dim> (FE_Q<dim>(3), 1,
-                                    FE_Q<dim>(4), 1));
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1));
+  element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),3)), 1,
+                                    FE_Q<dim>(QIterated<1>(QTrapez<1>(),4)), 1));
 
   hp::DoFHandler<dim> dof(tr);
 

diff --git a/tests/hp/create_rhs_01.cc b/tests/hp/create_rhs_01.cc
index 3497130a7c8f201b497d07f50f5835eb1702cfcb..3a5ec144f2f939d52040133e1321984ff17789f7 100644 (file)
--- a/tests/hp/create_rhs_01.cc
+++ b/tests/hp/create_rhs_01.cc
@@ -47,7 +47,7 @@ void test ()
   triangulation.refine_global(1);
 
   //define DoFhandler and FEs
-  FE_Q<2> u(2),u2(3);
+  FE_Q<2> u(2),u2(QIterated<1>(QTrapez<1>(),3));
 
   hp::FECollection<2> fe_collection;
   fe_collection.push_back(u);

diff --git a/tests/hp/hp_constraints_q.cc b/tests/hp/hp_constraints_q.cc
index eace437386bc4c2fbfeca9715639a39a512d959f..12eaa37a300ded8a8a9ae405ea5ad1c6ab2bd885 100644 (file)
--- a/tests/hp/hp_constraints_q.cc
+++ b/tests/hp/hp_constraints_q.cc
@@ -31,7 +31,7 @@ void test ()
   std::vector<unsigned int> degrees;
   for (unsigned int i=1; i<4; ++i)
     {
-      fe.push_back (FE_Q<dim>(i));
+      fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)));
       degrees.push_back (i);
     }
 

diff --git a/tests/hp/hp_constraints_q_system.cc b/tests/hp/hp_constraints_q_system.cc
index ec77473cd9b08a44ebd7c3ed3dc8007813466647..bd74996e0ba96efab3d86fa06a8ffc396c1ec269 100644 (file)
--- a/tests/hp/hp_constraints_q_system.cc
+++ b/tests/hp/hp_constraints_q_system.cc
@@ -32,7 +32,7 @@ void test ()
   std::vector<unsigned int> degrees;
   for (unsigned int i=1; i<4; ++i)
     {
-      fe.push_back (FESystem<dim>(FE_Q<dim>(i), 1,
+      fe.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
                                   FE_DGQ<dim>(i+1), 1));
       degrees.push_back (i);
     }

diff --git a/tests/hp/hp_constraints_q_system_x.cc b/tests/hp/hp_constraints_q_system_x.cc
index 565b2fa290b503adebcfddf5102eef29a6e847bc..3b1e31dc8177cf56645d4ecdc261c37f8930dd87 100644 (file)
--- a/tests/hp/hp_constraints_q_system_x.cc
+++ b/tests/hp/hp_constraints_q_system_x.cc
@@ -34,7 +34,7 @@ void test ()
   hp::FECollection<dim> fe;
   for (unsigned int i=1; i<4; ++i)
     for (unsigned int j=0; j<4; ++j)
-      fe.push_back (FESystem<dim>(FE_Q<dim>(i), 1,
+      fe.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
                                   FE_DGQ<dim>(j), 1));
 
   deallog << "No hanging nodes test" << std::endl;

diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc
index 6bb86e7b614511ca29b88ca1a9ccd4063c0228b1..97670d9770790eff9950142f503511364185aa28 100644 (file)
--- a/tests/hp/hp_hanging_nodes_01.cc
+++ b/tests/hp/hp_hanging_nodes_01.cc
@@ -163,7 +163,7 @@ int main ()
 
   FE_Q<2> fe_1 (1);
   FE_Q<2> fe_2 (2);
-  FE_Q<2> fe_3 (3);
+  FE_Q<2> fe_3 (QIterated<1>(QTrapez<1>(),3));
 
   hp::FECollection<2> fe_coll2;
   fe_coll2.push_back (fe_3);

diff --git a/tests/hp/hp_hanging_nodes_02.cc b/tests/hp/hp_hanging_nodes_02.cc
index 1af457300f124adcaadf559fb75580615d9c207d..82fc79c47410ed57b85792163e33c06d0ea4616a 100644 (file)
--- a/tests/hp/hp_hanging_nodes_02.cc
+++ b/tests/hp/hp_hanging_nodes_02.cc
@@ -63,10 +63,10 @@ void run (bool random_p,
   hp::DoFHandler<dim>        dof_handler(triangulation);
   ConstraintMatrix     hanging_node_constraints;
 
-  FE_Q<dim> fe_1 (indx[0]),
-       fe_2 (indx[1]),
-       fe_3 (indx[2]),
-       fe_4 (indx[3]);
+  FE_Q<dim> fe_1 (QIterated<1>(QTrapez<1>(),indx[0])),
+       fe_2 (QIterated<1>(QTrapez<1>(),indx[1])),
+       fe_3 (QIterated<1>(QTrapez<1>(),indx[2])),
+       fe_4 (QIterated<1>(QTrapez<1>(),indx[3]));
 
   fe.push_back (fe_1);
   fe.push_back (fe_2);

diff --git a/tests/hp/hp_line_dof_identities_q.cc b/tests/hp/hp_line_dof_identities_q.cc
index 9c3cc579a1d0e7dfc23f1cb931afaf13168dc3e3..f1ace27f8685c8d3a10ea2d64ebe63d5a31e92a7 100644 (file)
--- a/tests/hp/hp_line_dof_identities_q.cc
+++ b/tests/hp/hp_line_dof_identities_q.cc
@@ -22,6 +22,7 @@
 #include <deal.II/base/logstream.h>
 #include <deal.II/hp/fe_collection.h>
 #include <deal.II/fe/fe_q.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <fstream>
 
@@ -31,7 +32,7 @@ void test ()
 {
   hp::FECollection<dim> fe_collection;
   for (unsigned int i=1; i<8-dim; ++i)
-    fe_collection.push_back (FE_Q<dim>(i));
+    fe_collection.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)));
 
   for (unsigned int i=0; i<fe_collection.size(); ++i)
     for (unsigned int j=0; j<fe_collection.size(); ++j)

diff --git a/tests/hp/hp_line_dof_identities_q_system_01.cc b/tests/hp/hp_line_dof_identities_q_system_01.cc
index 02afb7d375718f8810896f5eb3affad457c9ca34..0c5e0779d4ae42d4951db14e49170b7a0b2fe807 100644 (file)
--- a/tests/hp/hp_line_dof_identities_q_system_01.cc
+++ b/tests/hp/hp_line_dof_identities_q_system_01.cc
@@ -23,6 +23,7 @@
 #include <deal.II/hp/fe_collection.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <fstream>
 
@@ -32,7 +33,7 @@ void test ()
 {
   hp::FECollection<dim> fe_collection;
   for (unsigned int i=1; i<8-dim; ++i)
-    fe_collection.push_back (FESystem<dim>(FE_Q<dim>(i),3));
+    fe_collection.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),3));
 
   for (unsigned int i=0; i<fe_collection.size(); ++i)
     for (unsigned int j=0; j<fe_collection.size(); ++j)

diff --git a/tests/hp/hp_line_dof_identities_q_system_02.cc b/tests/hp/hp_line_dof_identities_q_system_02.cc
index 15dafcfe9044b256ff7baf9b70428bf523ad3b70..9c6a959091b8dd41df3ac1f1f36acb3f1d8889de 100644 (file)
--- a/tests/hp/hp_line_dof_identities_q_system_02.cc
+++ b/tests/hp/hp_line_dof_identities_q_system_02.cc
@@ -24,6 +24,7 @@
 #include <deal.II/hp/fe_collection.h>
 #include <deal.II/fe/fe_q.h>
 #include <deal.II/fe/fe_system.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <fstream>
 
@@ -37,11 +38,11 @@ void test ()
       // add the system three times, with
       // different numbers of base elements
       // and multiplicities
-      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(i),3));
-      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(i),2,
-                                             FE_Q<dim>(i),1));
-      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(i),1,
-                                             FE_Q<dim>(i),2));
+      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),3));
+      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),2,
+                                             FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),1));
+      fe_collection.push_back (FESystem<dim>(FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),1,
+                                             FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)),2));
     }
 
   for (unsigned int i=0; i<fe_collection.size(); ++i)

diff --git a/tests/hp/integrate_difference.cc b/tests/hp/integrate_difference.cc
index b1076f11cc09619829ea517e8ec3d012a41b3af9..8d88f22cc785950a1a786bb8e89c09e1d59e6ede 100644 (file)
--- a/tests/hp/integrate_difference.cc
+++ b/tests/hp/integrate_difference.cc
@@ -56,7 +56,7 @@ void test ()
   hp::QCollection<dim> q_collection;
   for (unsigned int i=1; i<=4; ++i)
     {
-      fe_collection.push_back(FE_Q<dim> (i));
+      fe_collection.push_back(FE_Q<dim> (QIterated<1>(QTrapez<1>(),i)));
       q_collection.push_back (QGauss<dim> (i+2));
     }
 

diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index 798ed1714fd60a97deb916959f6eaf2d8fde3325..04116f646eec04c2ffc85f32d972fa5162b1e382 100644 (file)
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -143,8 +143,8 @@ check ()
   // of one Q1 and one Q2 element
   hp::FECollection<dim> element;
   for (unsigned int i=1; i<7-dim; ++i)
-    element.push_back (FESystem<dim> (FE_Q<dim>(i), 1,
-                                      FE_Q<dim>(i+1), 1));
+    element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
+                                      FE_Q<dim>(QIterated<1>(QTrapez<1>(),i+1)), 1));
   hp::DoFHandler<dim> dof(tr);
   for (typename hp::DoFHandler<dim>::active_cell_iterator
        cell = dof.begin_active(); cell!=dof.end(); ++cell)

diff --git a/tests/hp/set_dof_values_by_interpolation_03.cc b/tests/hp/set_dof_values_by_interpolation_03.cc
index fb6673ffc755e6c083ea84f53ab1cbe54a0e9047..2c70b16127b8758cca94f8b9e7e7b1d984027ce2 100644 (file)
--- a/tests/hp/set_dof_values_by_interpolation_03.cc
+++ b/tests/hp/set_dof_values_by_interpolation_03.cc
@@ -53,7 +53,7 @@ void test ()
 
   hp::FECollection<dim> fe;
   for (unsigned int i=1; i<5; ++i)
-    fe.push_back (FE_Q<dim>(i));
+    fe.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)));
 
   hp::DoFHandler<dim> dof_handler(tr);
   for (typename hp::DoFHandler<dim>::cell_iterator cell=dof_handler.begin();
@@ -103,6 +103,3 @@ main()
 
   return 0;
 }
-
-
-

diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc
index ed4093610f3752d61713809224413eef72aae990..256bedc42aeda1f9f495fc02af66c07294bc6fec 100644 (file)
--- a/tests/hp/step-3b.cc
+++ b/tests/hp/step-3b.cc
@@ -249,10 +249,10 @@ void LaplaceProblem::run ()
 {
   FE_Q<2> fe_1 (1),
        fe_2 (2),
-       fe_3 (3),
-       fe_4 (4),
-       fe_5 (5),
-       fe_6 (6);
+       fe_3 (QIterated<1>(QTrapez<1>(),3)),
+       fe_4 (QIterated<1>(QTrapez<1>(),4)),
+       fe_5 (QIterated<1>(QTrapez<1>(),5)),
+       fe_6 (QIterated<1>(QTrapez<1>(),6));
 
   fe.push_back (fe_1);
   fe.push_back (fe_2);

diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc
index b4f885cc9ce0cf9c662e86f7faecd9ce1bb536ea..ccb56f9cca4b70c2b0171e524b88ba3f1bfa9901 100644 (file)
--- a/tests/hp/step-3c.cc
+++ b/tests/hp/step-3c.cc
@@ -252,10 +252,10 @@ void LaplaceProblem::run ()
 {
   FE_Q<2> fe_1 (1),
        fe_2 (2),
-       fe_3 (3),
-       fe_4 (4),
-       fe_5 (5),
-       fe_6 (6);
+       fe_3 (QIterated<1>(QTrapez<1>(),3)),
+       fe_4 (QIterated<1>(QTrapez<1>(),4)),
+       fe_5 (QIterated<1>(QTrapez<1>(),5)),
+       fe_6 (QIterated<1>(QTrapez<1>(),6));
 
   fe.push_back (fe_1);
   fe.push_back (fe_2);

diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index 7e16d7311a9b80cc12879729abe763415c68e972..fc111c1b98fc6b5aa2400ca6e7830d95b7528d84 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -86,8 +86,8 @@ check ()
   // of one Q1 and one Q2 element
   hp::FECollection<dim> element;
   for (unsigned int i=1; i<7-dim; ++i)
-    element.push_back (FESystem<dim> (FE_Q<dim>(i), 1,
-                                      FE_Q<dim>(i+1), 1));
+    element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
+                                      FE_Q<dim>(QIterated<1>(QTrapez<1>(),i+1)), 1));
   hp::DoFHandler<dim> dof(tr);
   for (typename hp::DoFHandler<dim>::active_cell_iterator
        cell = dof.begin_active(); cell!=dof.end(); ++cell)

diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index 45a3c65420a804c311c0132fa7f40e3111c50f49..32b8609b0115b18e481e6cd945389fe4b75f2841 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -85,7 +85,7 @@ check ()
   // of one Q1 and one Q2 element
   hp::FECollection<dim> element;
   for (unsigned int i=1; i<7-dim; ++i)
-    element.push_back (FE_Q<dim>(i));
+    element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)));
   hp::DoFHandler<dim> dof(tr);
   for (typename hp::DoFHandler<dim>::active_cell_iterator
        cell = dof.begin_active(); cell!=dof.end(); ++cell)

diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index 1c5f00c3676919f713b1f6c9a258b9076fc0bbf4..a409c0a81744d4b76285088471e4a3655db5b358 100644 (file)
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -86,8 +86,8 @@ check ()
   // of one Q1 and one Q2 element
   hp::FECollection<dim> element;
   for (unsigned int i=1; i<7-dim; ++i)
-    element.push_back (FESystem<dim> (FE_Q<dim>(i), 1,
-                                      FE_Q<dim>(i+1), 1));
+    element.push_back (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)), 1,
+                                      FE_Q<dim>(QIterated<1>(QTrapez<1>(),i+1)), 1));
   hp::DoFHandler<dim> dof(tr);
   for (typename hp::DoFHandler<dim>::active_cell_iterator
        cell = dof.begin_active(); cell!=dof.end(); ++cell)

diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index d9bf4c8f889e391dbbf334452e399fb2e6fd5bb9..a9f54765ef5410581eebdd4a6eae84877ac9cba0 100644 (file)
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -85,7 +85,7 @@ check ()
   // of one Q1 and one Q2 element
   hp::FECollection<dim> element;
   for (unsigned int i=1; i<7-dim; ++i)
-    element.push_back (FE_Q<dim>(i));
+    element.push_back (FE_Q<dim>(QIterated<1>(QTrapez<1>(),i)));
   hp::DoFHandler<dim> dof(tr);
   for (typename hp::DoFHandler<dim>::active_cell_iterator
        cell = dof.begin_active(); cell!=dof.end(); ++cell)

diff --git a/tests/lac/constraint_graph.cc b/tests/lac/constraint_graph.cc
index a4b772c1aca4f06e49f720c001f75cd719d8fc8d..a7465d2ddc8cc74352ce1ea3af5613a9a5c6c955 100644 (file)
--- a/tests/lac/constraint_graph.cc
+++ b/tests/lac/constraint_graph.cc
@@ -30,6 +30,7 @@
 #include <deal.II/dofs/dof_tools.h>
 #include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/fe/fe_q.h>
+#include <deal.II/base/quadrature_lib.h>
 
 #include <fstream>
 
@@ -47,8 +48,8 @@ void test ()
   hp::FECollection<dim> fe_collection;
   fe_collection.push_back(FE_Q<dim> (1));
   fe_collection.push_back(FE_Q<dim> (2));
-  fe_collection.push_back(FE_Q<dim> (3));
-  fe_collection.push_back(FE_Q<dim> (4));
+  fe_collection.push_back(FE_Q<dim> (QIterated<1>(QTrapez<1>(),3)));
+  fe_collection.push_back(FE_Q<dim> (QIterated<1>(QTrapez<1>(),4)));
 
   hp::DoFHandler<dim> dof_handler(tria);
 

diff --git a/tests/numerics/derivative_approximation.cc b/tests/numerics/derivative_approximation.cc
index 8a0b229619627ea0754be28471957e340520b35d..a3f4fe285f6cb3b051be8c90ff701a699efc7548 100644 (file)
--- a/tests/numerics/derivative_approximation.cc
+++ b/tests/numerics/derivative_approximation.cc
@@ -53,7 +53,7 @@ check ()
   if (dim==1)
     tr.refine_global(2);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(element);
 

diff --git a/tests/numerics/error_estimator.cc b/tests/numerics/error_estimator.cc
index 4c650194428c3b06d6c147abda601b38e3d77888..6e3faed0e7eb58bbb71d72f0976fc9ce8bb40809 100644 (file)
--- a/tests/numerics/error_estimator.cc
+++ b/tests/numerics/error_estimator.cc
@@ -95,7 +95,7 @@ check ()
   if (dim==1)
     tr.refine_global(2);
 
-  FE_Q<dim> element(3);
+  FE_Q<dim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim> dof(tr);
   dof.distribute_dofs(element);
 

diff --git a/tests/numerics/error_estimator_01.cc b/tests/numerics/error_estimator_01.cc
index 761e4214ac3db348af83290704a14faaaa60e433..2bd9e140328d5df5463329213b09742f7fd847f2 100644 (file)
--- a/tests/numerics/error_estimator_01.cc
+++ b/tests/numerics/error_estimator_01.cc
@@ -51,7 +51,7 @@ check ()
   tr.execute_coarsening_and_refinement ();
 
 
-  FE_Q<dim,spacedim> element(3);
+  FE_Q<dim,spacedim> element(QIterated<1>(QTrapez<1>(),3));
   DoFHandler<dim,spacedim> dof(tr);
   dof.distribute_dofs(element);
 

diff --git a/tests/numerics/error_estimator_02.cc b/tests/numerics/error_estimator_02.cc
index 31c2c99a80ec42ec2be481650992ac6058df7dac..2991f20b686eaf34ee5cb720d1c0d854cb95d14b 100644 (file)
--- a/tests/numerics/error_estimator_02.cc
+++ b/tests/numerics/error_estimator_02.cc
@@ -260,7 +260,7 @@ void test_neumann(const NeumanBC<dim> &func)
 
   const unsigned int p = 3;
 
-  fe_collection.push_back(dealii::FE_Q<dim>(p));
+  fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(),p)));
   quadrature_formula.push_back(dealii::QGauss<dim>(p+5));
   face_quadrature_formula.push_back(dealii::QGauss<dim-1>(p+5));
 
@@ -348,7 +348,7 @@ void test_regular(const MyFunction<dim> &func)
   for (unsigned int i=0; i<p_degree.size(); i++)
     {
       const unsigned int &p = p_degree[i];
-      fe_collection.push_back(dealii::FE_Q<dim>(p));
+      fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(),p)));
       quadrature_formula.push_back(dealii::QGauss<dim>(p+5));
       face_quadrature_formula.push_back(dealii::QGauss<dim-1>(p+5));
     }
@@ -462,7 +462,7 @@ void test_irregular(const MyFunction<dim> &func)
   for (unsigned int i=0; i<p_degree.size(); i++)
     {
       const unsigned int &p = p_degree[i];
-      fe_collection.push_back(dealii::FE_Q<dim>(p));
+      fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(),p)));
       quadrature_formula.push_back(dealii::QGauss<dim>(p+5));
       face_quadrature_formula.push_back(dealii::QGauss<dim-1>(p+5));
     }
@@ -631,7 +631,7 @@ void test(const MySecondFunction<dim> &func)
   dealii::ConstraintMatrix constraints;
   for (unsigned int p = 1; p <=3; p++)
     {
-      fe_collection.push_back(dealii::FE_Q<dim>(p));
+      fe_collection.push_back(dealii::FE_Q<dim>(QIterated<1>(QTrapez<1>(),p)));
       quadrature_formula.push_back(dealii::QGauss<dim>(p+1));
       face_quadrature_formula.push_back(dealii::QGauss<dim-1>(p+1));
     }

diff --git a/tests/numerics/no_flux_03.cc b/tests/numerics/no_flux_03.cc
index 92d95195dfc3324eda78af30c42d93dcede75b58..6053806ce1afdc340efe3af32aec26b0ac31c6a9 100644 (file)
--- a/tests/numerics/no_flux_03.cc
+++ b/tests/numerics/no_flux_03.cc
@@ -72,7 +72,7 @@ void test_hyper_sphere()
 
   for (unsigned int degree=1; degree<4; ++degree)
     {
-      FESystem<dim> fe (FE_Q<dim>(degree), dim);
+      FESystem<dim> fe (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim);
       test(tr, fe);
     }
 }

diff --git a/tests/numerics/no_flux_04.cc b/tests/numerics/no_flux_04.cc
index 2c360dc693e38eef96c1688d19f64729500b5e59..0525d9b4a0e0e4255090b43301bfea1ae70154f8 100644 (file)
--- a/tests/numerics/no_flux_04.cc
+++ b/tests/numerics/no_flux_04.cc
@@ -131,7 +131,7 @@ void test_hyper_sphere()
 
   for (unsigned int degree=1; degree<6-dim; ++degree)
     {
-      FESystem<dim> fe (FE_Q<dim>(degree), dim);
+      FESystem<dim> fe (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim);
       test(tr, fe);
     }
 }

diff --git a/tests/numerics/no_flux_05.cc b/tests/numerics/no_flux_05.cc
index 8806a91ecc6d44d67d60a8b2d2f8b53392ce6077..52610dd2ba89f371f6f1f9575596d33c95974481 100644 (file)
--- a/tests/numerics/no_flux_05.cc
+++ b/tests/numerics/no_flux_05.cc
@@ -85,7 +85,7 @@ void test_hyper_cube()
 
   for (unsigned int degree=1; degree<4; ++degree)
     {
-      FESystem<dim> fe (FE_Q<dim>(degree), dim,
+      FESystem<dim> fe (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim,
                         FE_DGP<dim>(degree+1), 1);
       test(tr, fe);
     }

diff --git a/tests/numerics/no_flux_hp_03.cc b/tests/numerics/no_flux_hp_03.cc
index a1c6e5d50f399d49df146cc7c955bf6256783189..18909705c7faf26071843ef6b7d8238d60d5636e 100644 (file)
--- a/tests/numerics/no_flux_hp_03.cc
+++ b/tests/numerics/no_flux_hp_03.cc
@@ -66,7 +66,7 @@ void test_hyper_sphere()
 
   for (unsigned int degree=1; degree<4; ++degree)
     {
-      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(degree), dim));
+      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim));
       test(tr, fe);
     }
 }

diff --git a/tests/numerics/no_flux_hp_04.cc b/tests/numerics/no_flux_hp_04.cc
index adf29c3364f25182be942e2990f81a75091d8d3c..53830ec3c1aa29fce9c127384e8997bf419138d8 100644 (file)
--- a/tests/numerics/no_flux_hp_04.cc
+++ b/tests/numerics/no_flux_hp_04.cc
@@ -124,7 +124,7 @@ void test_hyper_sphere()
 
   for (unsigned int degree=1; degree<6-dim; ++degree)
     {
-      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(degree), dim));
+      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim));
       test(tr, fe);
     }
 }

diff --git a/tests/numerics/no_flux_hp_05.cc b/tests/numerics/no_flux_hp_05.cc
index e9bf4bdb3927f9f7a0c56ef9d279dca55af5a20c..786f20c51d5e07596e877668e6a9077dd4f02ad8 100644 (file)
--- a/tests/numerics/no_flux_hp_05.cc
+++ b/tests/numerics/no_flux_hp_05.cc
@@ -76,7 +76,7 @@ void test_hyper_cube()
 
   for (unsigned int degree=1; degree<4; ++degree)
     {
-      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(degree), dim,
+      hp::FECollection<dim> fe (FESystem<dim> (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim,
                                                FE_DGP<dim>(degree+1), 1));
       test(tr, fe);
     }

diff --git a/tests/numerics/normal_flux_03.cc b/tests/numerics/normal_flux_03.cc
index 404752835acf92ac57fa8c81ab555bb9b01b36b1..e5b155ef1bdf05abd9784248f21e8efecc1b3d31 100644 (file)
--- a/tests/numerics/normal_flux_03.cc
+++ b/tests/numerics/normal_flux_03.cc
@@ -67,7 +67,7 @@ void test_hyper_sphere()
 
   for (unsigned int degree=1; degree<4; ++degree)
     {
-      FESystem<dim> fe (FE_Q<dim>(degree), dim);
+      FESystem<dim> fe (FE_Q<dim>(QIterated<1>(QTrapez<1>(),degree)), dim);
       test(tr, fe);
     }
 }