GC: test FE_DGQ(0)

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
index 940025b38cbcf4e5453ba083f0002588d4870178..b3fa63a2df0d16457d0b1927bc6fc7c343ef49a1 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
@@ -122,17 +122,19 @@ test(int fe_degree)
   const auto str_fine   = std::to_string(fe_degree);
   const auto str_coarse = std::to_string(fe_degree);
 
-  {
-    deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
-    do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
-    deallog.pop();
-  }
-
-  {
-    deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
-    do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
-    deallog.pop();
-  }
+  if (fe_degree > 0)
+    {
+      deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
+      deallog.pop();
+    }
+
+  if (fe_degree > 0)
+    {
+      deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
+      deallog.pop();
+    }
 
   {
     deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
@@ -149,6 +151,6 @@ main(int argc, char **argv)
 
   deallog.precision(8);
 
-  for (unsigned int i = 1; i < 5; ++i)
+  for (unsigned int i = 0; i < 5; ++i)
     test<2, double>(i);
 }

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output
index 00bca4d7c8f257ab9e712d858266d41cd5a62bea..66aab13cc0205aabe9b48f5bc09dc03d0deccb2f 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=1.output
@@ -1,4 +1,10 @@
 
+DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output
index ca8ee32ae19f1dc4e078d526a9fdf9ffecd3e789..e40bc0269f3ff6e0a457d0cb7f3d8cc5bfd31fe5 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.with_p4est=true.mpirun=2.output
@@ -1,4 +1,10 @@
 
+DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
@@ -72,6 +78,12 @@ DEAL:0:DG<2>(4)<->DG<2>(4)::36.864132
 DEAL:0:DG<2>(4)<->DG<2>(4)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 DEAL:0:DG<2>(4)<->DG<2>(4)::1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 
+DEAL:1:DG<2>(0)<->DG<2>(0)::3.1622777
+DEAL:1:DG<2>(0)<->DG<2>(0)::
+DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:1:DG<2>(0)<->DG<2>(0)::5.8309519
+DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:1:DG<2>(0)<->DG<2>(0)::
 DEAL:1:CG<2>(1)<->CG<2>(1)::4.2426407
 DEAL:1:CG<2>(1)<->CG<2>(1)::
 DEAL:1:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
index 78e0464561ab10ffd99d8aca3d96c1f79bbd0ff6..541647833dcaca57c6d984384b6f7cb10bcd322e 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
@@ -118,17 +118,19 @@ test(int fe_degree)
   const auto str_fine   = std::to_string(fe_degree);
   const auto str_coarse = std::to_string(fe_degree);
 
-  {
-    deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
-    do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
-    deallog.pop();
-  }
-
-  {
-    deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
-    do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
-    deallog.pop();
-  }
+  if (fe_degree > 0)
+    {
+      deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_Q<dim>(fe_degree), FE_Q<dim>(fe_degree));
+      deallog.pop();
+    }
+
+  if (fe_degree > 0)
+    {
+      deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_DGQ<dim>(fe_degree), FE_Q<dim>(fe_degree));
+      deallog.pop();
+    }
 
   {
     deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
@@ -145,6 +147,6 @@ main(int argc, char **argv)
 
   deallog.precision(8);
 
-  for (unsigned int i = 1; i < 5; ++i)
+  for (unsigned int i = 0; i < 5; ++i)
     test<2, double>(i);
 }

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output
index ca8ee32ae19f1dc4e078d526a9fdf9ffecd3e789..e40bc0269f3ff6e0a457d0cb7f3d8cc5bfd31fe5 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_03.with_p4est=true.mpirun=2.output
@@ -1,4 +1,10 @@
 
+DEAL:0:DG<2>(0)<->DG<2>(0)::3.1622777
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::5.8309519
+DEAL:0:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:0:DG<2>(0)<->DG<2>(0)::4.0000000 1.0000000 4.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::4.2426407
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 DEAL:0:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
@@ -72,6 +78,12 @@ DEAL:0:DG<2>(4)<->DG<2>(4)::36.864132
 DEAL:0:DG<2>(4)<->DG<2>(4)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 DEAL:0:DG<2>(4)<->DG<2>(4)::1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 4.8950494 7.1570871 16.431441 7.1570871 4.8950494 2.1321498 3.1174316 7.1570871 3.1174316 2.1321498 1.4582719 2.1321498 4.8950494 2.1321498 1.4582719 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
 
+DEAL:1:DG<2>(0)<->DG<2>(0)::3.1622777
+DEAL:1:DG<2>(0)<->DG<2>(0)::
+DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:1:DG<2>(0)<->DG<2>(0)::5.8309519
+DEAL:1:DG<2>(0)<->DG<2>(0)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 
+DEAL:1:DG<2>(0)<->DG<2>(0)::
 DEAL:1:CG<2>(1)<->CG<2>(1)::4.2426407
 DEAL:1:CG<2>(1)<->CG<2>(1)::
 DEAL:1:CG<2>(1)<->CG<2>(1)::1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000 1.0000000