From a4fb77ab8373255822da360515341d1de3f2aac1 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Mon, 2 Sep 2019 02:40:37 +0000 Subject: [PATCH] Enable tests with hanging nodes when dim = 2 and fe_degree is even --- tests/cuda/matrix_free_matrix_vector_01.output | 3 +++ tests/cuda/matrix_free_matrix_vector_02.output | 3 +++ tests/cuda/matrix_free_matrix_vector_03.cu | 12 +++++------- tests/cuda/matrix_free_matrix_vector_03.output | 3 +++ tests/cuda/matrix_free_matrix_vector_03b.cu | 12 +++++------- tests/cuda/matrix_free_matrix_vector_03b.output | 3 +++ tests/cuda/matrix_free_matrix_vector_04.output | 3 +++ tests/cuda/matrix_free_matrix_vector_05.cu | 12 +++++------- tests/cuda/matrix_free_matrix_vector_05.output | 3 +++ tests/cuda/matrix_vector_common.h | 2 +- 10 files changed, 34 insertions(+), 22 deletions(-) diff --git a/tests/cuda/matrix_free_matrix_vector_01.output b/tests/cuda/matrix_free_matrix_vector_01.output index ed73cb7cd9..43ef13cd75 100644 --- 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 ed73cb7cd9..43ef13cd75 100644 --- 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 147febd3f5..c175a423ad 100644 --- 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, - fe_degree + 1>(dof, constraints, tria.n_active_cells()); + do_test, + 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 ab11bfed67..afa453aed9 100644 --- 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 772bcba081..f386db0bb6 100644 --- 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, - fe_degree + 1>(dof, constraints, tria.n_active_cells(), true, true); + do_test, + 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 ab11bfed67..afa453aed9 100644 --- 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 ed73cb7cd9..43ef13cd75 100644 --- 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 48efc829d1..4226aec558 100644 --- 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, - fe_degree + 1>(dof, constraints, tria.n_active_cells()); + do_test, + 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 ed73cb7cd9..43ef13cd75 100644 --- 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 2c3586b2d9..317aee39b7 100644 --- 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"); -- 2.39.5