Enable tests with hanging nodes when dim = 2 and fe_degree is even

diff --git a/tests/cuda/matrix_free_matrix_vector_01.output b/tests/cuda/matrix_free_matrix_vector_01.output
index ed73cb7cd98d5fbc36775ec0fef55eede460c983..43ef13cd754847276775ad0edd4edc6128e9942f 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_01.output
+++ b/tests/cuda/matrix_free_matrix_vector_01.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::

diff --git a/tests/cuda/matrix_free_matrix_vector_02.output b/tests/cuda/matrix_free_matrix_vector_02.output
index ed73cb7cd98d5fbc36775ec0fef55eede460c983..43ef13cd754847276775ad0edd4edc6128e9942f 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_02.output
+++ b/tests/cuda/matrix_free_matrix_vector_02.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::

diff --git a/tests/cuda/matrix_free_matrix_vector_03.cu b/tests/cuda/matrix_free_matrix_vector_03.cu
index 147febd3f506f138b8588d1223d170d10f7212ad..c175a423ad0205d77eae28a8f9634457b366fe92 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_03.cu
+++ b/tests/cuda/matrix_free_matrix_vector_03.cu
@@ -66,11 +66,9 @@ test()
                                            constraints);
   constraints.close();
 
-  // Skip 2D tests with even fe_degree
-  if ((dim == 3) || ((fe_degree % 2) == 1))
-    do_test<dim,
-            fe_degree,
-            double,
-            LinearAlgebra::CUDAWrappers::Vector<double>,
-            fe_degree + 1>(dof, constraints, tria.n_active_cells());
+  do_test<dim,
+          fe_degree,
+          double,
+          LinearAlgebra::CUDAWrappers::Vector<double>,
+          fe_degree + 1>(dof, constraints, tria.n_active_cells());
 }

diff --git a/tests/cuda/matrix_free_matrix_vector_03.output b/tests/cuda/matrix_free_matrix_vector_03.output
index ab11bfed67004dbf09896bd6d701c3811aaacfbc..afa453aed9f2716a525cf677e2746011d845c12c 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_03.output
+++ b/tests/cuda/matrix_free_matrix_vector_03.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0.
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0.
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0.
 DEAL:2d::

diff --git a/tests/cuda/matrix_free_matrix_vector_03b.cu b/tests/cuda/matrix_free_matrix_vector_03b.cu
index 772bcba0811747e978a2f301f01e6d35ab8e0345..f386db0bb6842e4ef207d136e89b0bd9851ac483 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_03b.cu
+++ b/tests/cuda/matrix_free_matrix_vector_03b.cu
@@ -67,11 +67,9 @@ test()
                                            constraints);
   constraints.close();
 
-  // Skip 2D tests with even fe_degree
-  if ((dim == 3) || ((fe_degree % 2) == 1))
-    do_test<dim,
-            fe_degree,
-            double,
-            LinearAlgebra::CUDAWrappers::Vector<double>,
-            fe_degree + 1>(dof, constraints, tria.n_active_cells(), true, true);
+  do_test<dim,
+          fe_degree,
+          double,
+          LinearAlgebra::CUDAWrappers::Vector<double>,
+          fe_degree + 1>(dof, constraints, tria.n_active_cells(), true, true);
 }

diff --git a/tests/cuda/matrix_free_matrix_vector_03b.output b/tests/cuda/matrix_free_matrix_vector_03b.output
index ab11bfed67004dbf09896bd6d701c3811aaacfbc..afa453aed9f2716a525cf677e2746011d845c12c 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_03b.output
+++ b/tests/cuda/matrix_free_matrix_vector_03b.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0.
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0.
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0.
 DEAL:2d::

diff --git a/tests/cuda/matrix_free_matrix_vector_04.output b/tests/cuda/matrix_free_matrix_vector_04.output
index ed73cb7cd98d5fbc36775ec0fef55eede460c983..43ef13cd754847276775ad0edd4edc6128e9942f 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_04.output
+++ b/tests/cuda/matrix_free_matrix_vector_04.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::

diff --git a/tests/cuda/matrix_free_matrix_vector_05.cu b/tests/cuda/matrix_free_matrix_vector_05.cu
index 48efc829d1cd2566de413bb995a8b3872495852d..4226aec558063be96ada3ad05aa9c605bb148f46 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_05.cu
+++ b/tests/cuda/matrix_free_matrix_vector_05.cu
@@ -76,11 +76,9 @@ test()
   DoFTools::make_hanging_node_constraints(dof, constraints);
   constraints.close();
 
-  // Skip 2D tests with even fe_degree
-  if ((dim == 3) || ((fe_degree % 2) == 1))
-    do_test<dim,
-            fe_degree,
-            double,
-            LinearAlgebra::CUDAWrappers::Vector<double>,
-            fe_degree + 1>(dof, constraints, tria.n_active_cells());
+  do_test<dim,
+          fe_degree,
+          double,
+          LinearAlgebra::CUDAWrappers::Vector<double>,
+          fe_degree + 1>(dof, constraints, tria.n_active_cells());
 }

diff --git a/tests/cuda/matrix_free_matrix_vector_05.output b/tests/cuda/matrix_free_matrix_vector_05.output
index ed73cb7cd98d5fbc36775ec0fef55eede460c983..43ef13cd754847276775ad0edd4edc6128e9942f 100644 (file)
--- a/tests/cuda/matrix_free_matrix_vector_05.output
+++ b/tests/cuda/matrix_free_matrix_vector_05.output
@@ -2,6 +2,9 @@
 DEAL:2d::Testing FE_Q<2>(1)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::
+DEAL:2d::Testing FE_Q<2>(2)
+DEAL:2d::Norm of difference: 0
+DEAL:2d::
 DEAL:2d::Testing FE_Q<2>(3)
 DEAL:2d::Norm of difference: 0
 DEAL:2d::

diff --git a/tests/cuda/matrix_vector_common.h b/tests/cuda/matrix_vector_common.h
index 2c3586b2d9de0b6082a9ef49f3957c3b12ea2f6f..317aee39b7a6ea512c7d95543c90ddee24b720a1 100644 (file)
--- a/tests/cuda/matrix_vector_common.h
+++ b/tests/cuda/matrix_vector_common.h
@@ -198,7 +198,7 @@ main()
   {
     deallog.push("2d");
     test<2, 1>();
-    // test<2, 2>();
+    test<2, 2>();
     test<2, 3>();
     deallog.pop();
     deallog.push("3d");