From eee24e5ba5d06bb6b8b8656ed01f8763e918ef32 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 31 Jul 2021 12:46:39 +0200 Subject: [PATCH] Update tests --- tests/feinterface/face_orientation_01.cc | 3 +- tests/feinterface/fe_interface_values_02.cc | 15 ++-- .../feinterface/fe_interface_values_02.output | 16 ++-- tests/feinterface/fe_interface_values_03.cc | 16 ++-- .../feinterface/fe_interface_values_03.output | 16 ++-- tests/feinterface/fe_interface_values_04.cc | 14 ++-- .../feinterface/fe_interface_values_04.output | 16 ++-- tests/feinterface/fe_interface_values_06.cc | 16 ++-- .../feinterface/fe_interface_values_06.output | 8 +- tests/feinterface/fe_interface_values_07.cc | 16 ++-- .../feinterface/fe_interface_values_07.output | 8 +- tests/feinterface/fe_interface_values_08.cc | 37 ++++---- .../feinterface/fe_interface_values_08.output | 84 +++++++++---------- tests/feinterface/fe_interface_values_09.cc | 11 +-- .../feinterface/fe_interface_values_09.output | 32 +++---- tests/feinterface/fe_interface_view_01.cc | 46 +++++----- tests/feinterface/fe_interface_view_02.cc | 61 ++++++++------ tests/feinterface/step-12.cc | 2 +- tests/meshworker/scratch_data_08.cc | 7 +- tests/simplex/matrix_free_03.cc | 28 ++++--- tests/simplex/poisson_02.cc | 13 +-- tests/simplex/step-12.cc | 2 +- tests/simplex/step-12a.cc | 2 +- tests/simplex/step-74.cc | 28 ++++--- 24 files changed, 265 insertions(+), 232 deletions(-) diff --git a/tests/feinterface/face_orientation_01.cc b/tests/feinterface/face_orientation_01.cc index beecec988d..3abc7ed73f 100644 --- a/tests/feinterface/face_orientation_01.cc +++ b/tests/feinterface/face_orientation_01.cc @@ -88,7 +88,8 @@ test() for (unsigned int q = 0; q < fiv.get_quadrature().size(); ++q) for (unsigned int i = 0; i < fiv.n_current_interface_dofs(); ++i) - Assert(std::abs(fiv.jump(i, q)) <= 1e-12, ExcInternalError()); + Assert(std::abs(fiv.jump_in_shape_values(i, q)) <= 1e-12, + ExcInternalError()); } deallog << "Twist " << twist << "*pi/2 seems to work just fine..." diff --git a/tests/feinterface/fe_interface_values_02.cc b/tests/feinterface/fe_interface_values_02.cc index 689f2be36d..251359905d 100644 --- a/tests/feinterface/fe_interface_values_02.cc +++ b/tests/feinterface/fe_interface_values_02.cc @@ -14,7 +14,8 @@ // --------------------------------------------------------------------- -// evaluate jump(), average(), shape_value() of FEInterfaceValues +// evaluate jump_in_shape_values(), average_of_shape_values(), shape_value() of +// FEInterfaceValues #include @@ -114,16 +115,16 @@ test(unsigned int fe_degree) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "jump(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_values(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "average(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_values(): " << cell_vector << std::endl; } } diff --git a/tests/feinterface/fe_interface_values_02.output b/tests/feinterface/fe_interface_values_02.output index b0023c0ce5..fe3840c855 100644 --- a/tests/feinterface/fe_interface_values_02.output +++ b/tests/feinterface/fe_interface_values_02.output @@ -2,20 +2,20 @@ DEAL::FE_DGQ<2>(0) DEAL::shape_value(true): 1.00000 0.00000 DEAL::shape_value(false): 0.00000 1.00000 -DEAL::jump(): 1.00000 -1.00000 -DEAL::average(): 0.500000 0.500000 +DEAL::jump_in_shape_values(): 1.00000 -1.00000 +DEAL::average_of_shape_values(): 0.500000 0.500000 DEAL::FE_DGQ<2>(1) DEAL::shape_value(true): 0.00000 0.500000 0.00000 0.500000 0.00000 0.00000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.00000 0.00000 0.00000 0.500000 0.00000 0.500000 0.00000 -DEAL::jump(): 0.00000 0.500000 0.00000 0.500000 -0.500000 0.00000 -0.500000 0.00000 -DEAL::average(): 0.00000 0.250000 0.00000 0.250000 0.250000 0.00000 0.250000 0.00000 +DEAL::jump_in_shape_values(): 0.00000 0.500000 0.00000 0.500000 -0.500000 0.00000 -0.500000 0.00000 +DEAL::average_of_shape_values(): 0.00000 0.250000 0.00000 0.250000 0.250000 0.00000 0.250000 0.00000 DEAL::FE_DGQ<3>(0) DEAL::shape_value(true): 1.00000 0.00000 DEAL::shape_value(false): 0.00000 1.00000 -DEAL::jump(): 1.00000 -1.00000 -DEAL::average(): 0.500000 0.500000 +DEAL::jump_in_shape_values(): 1.00000 -1.00000 +DEAL::average_of_shape_values(): 0.500000 0.500000 DEAL::FE_DGQ<3>(1) DEAL::shape_value(true): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 -DEAL::jump(): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 -0.250000 0.00000 -0.250000 0.00000 -0.250000 0.00000 -0.250000 0.00000 -DEAL::average(): 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 +DEAL::jump_in_shape_values(): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 -0.250000 0.00000 -0.250000 0.00000 -0.250000 0.00000 -0.250000 0.00000 +DEAL::average_of_shape_values(): 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 0.125000 0.00000 diff --git a/tests/feinterface/fe_interface_values_03.cc b/tests/feinterface/fe_interface_values_03.cc index b241abdf1b..b0823148d7 100644 --- a/tests/feinterface/fe_interface_values_03.cc +++ b/tests/feinterface/fe_interface_values_03.cc @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -// evaluate jump(), average(), shape_value() of FEInterfaceValues on an adaptive -// mesh +// evaluate jump_in_shape_values(), average_of_shape_values(), shape_value() of +// FEInterfaceValues on an adaptive mesh #include @@ -133,16 +133,16 @@ test(unsigned int fe_degree) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "jump(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_values(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "average(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_values(): " << cell_vector << std::endl; } } diff --git a/tests/feinterface/fe_interface_values_03.output b/tests/feinterface/fe_interface_values_03.output index 477b2dea18..cfc64df654 100644 --- a/tests/feinterface/fe_interface_values_03.output +++ b/tests/feinterface/fe_interface_values_03.output @@ -5,8 +5,8 @@ DEAL:: idx: 0 global: 0 dof indices: -1 | 0 DEAL:: idx: 1 global: 2 dof indices: 0 | -1 DEAL::shape_value(true): 0.00000 0.500000 DEAL::shape_value(false): 0.500000 0.00000 -DEAL::jump(): -0.500000 0.500000 -DEAL::average(): 0.250000 0.250000 +DEAL::jump_in_shape_values(): -0.500000 0.500000 +DEAL::average_of_shape_values(): 0.250000 0.250000 DEAL::FE_DGQ<2>(1) DEAL::qpoint 0: 1.00000 0.105662 DEAL::qpoint 1: 1.00000 0.394338 @@ -20,16 +20,16 @@ DEAL:: idx: 6 global: 10 dof indices: 2 | -1 DEAL:: idx: 7 global: 11 dof indices: 3 | -1 DEAL::shape_value(true): 0.00000 0.00000 0.00000 0.00000 0.00000 0.250000 0.00000 0.250000 DEAL::shape_value(false): 0.375000 0.00000 0.125000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): -0.375000 0.00000 -0.125000 0.00000 0.00000 0.250000 0.00000 0.250000 -DEAL::average(): 0.187500 0.00000 0.0625000 0.00000 0.00000 0.125000 0.00000 0.125000 +DEAL::jump_in_shape_values(): -0.375000 0.00000 -0.125000 0.00000 0.00000 0.250000 0.00000 0.250000 +DEAL::average_of_shape_values(): 0.187500 0.00000 0.0625000 0.00000 0.00000 0.125000 0.00000 0.125000 DEAL::FE_DGQ<3>(0) DEAL::qpoint 0: 1.00000 0.250000 0.250000 DEAL:: idx: 0 global: 0 dof indices: -1 | 0 DEAL:: idx: 1 global: 2 dof indices: 0 | -1 DEAL::shape_value(true): 0.00000 0.250000 DEAL::shape_value(false): 0.250000 0.00000 -DEAL::jump(): -0.250000 0.250000 -DEAL::average(): 0.125000 0.125000 +DEAL::jump_in_shape_values(): -0.250000 0.250000 +DEAL::average_of_shape_values(): 0.125000 0.125000 DEAL::FE_DGQ<3>(1) DEAL::qpoint 0: 1.00000 0.105662 0.105662 DEAL::qpoint 1: 1.00000 0.394338 0.105662 @@ -53,5 +53,5 @@ DEAL:: idx: 14 global: 22 dof indices: 6 | -1 DEAL:: idx: 15 global: 23 dof indices: 7 | -1 DEAL::shape_value(true): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 DEAL::shape_value(false): 0.140625 0.00000 0.0468750 0.00000 0.0468750 0.00000 0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): -0.140625 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 -DEAL::average(): 0.0703125 0.00000 0.0234375 0.00000 0.0234375 0.00000 0.00781250 0.00000 0.00000 0.0312500 0.00000 0.0312500 0.00000 0.0312500 0.00000 0.0312500 +DEAL::jump_in_shape_values(): -0.140625 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 0.00000 0.0625000 +DEAL::average_of_shape_values(): 0.0703125 0.00000 0.0234375 0.00000 0.0234375 0.00000 0.00781250 0.00000 0.00000 0.0312500 0.00000 0.0312500 0.00000 0.0312500 0.00000 0.0312500 diff --git a/tests/feinterface/fe_interface_values_04.cc b/tests/feinterface/fe_interface_values_04.cc index bfb923052f..c92f4e4814 100644 --- a/tests/feinterface/fe_interface_values_04.cc +++ b/tests/feinterface/fe_interface_values_04.cc @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -// evaluate jump(), average(), shape_value() of FEInterfaceValues for -// at_boundary() +// evaluate jump_in_shape_values(), average_of_shape_values(), shape_value() of +// FEInterfaceValues for at_boundary() #include @@ -81,14 +81,16 @@ test(unsigned int fe_degree) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.jump(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "jump(): " << cell_vector << std::endl; + cell_vector(i) += + fiv.jump_in_shape_values(i, qpoint) * fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_values(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.average(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "average(): " << cell_vector << std::endl; + cell_vector(i) += + fiv.average_of_shape_values(i, qpoint) * fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_values(): " << cell_vector << std::endl; } diff --git a/tests/feinterface/fe_interface_values_04.output b/tests/feinterface/fe_interface_values_04.output index 3da4157a11..1e25c01888 100644 --- a/tests/feinterface/fe_interface_values_04.output +++ b/tests/feinterface/fe_interface_values_04.output @@ -2,20 +2,20 @@ DEAL::FE_DGQ<2>(0) DEAL::shape_value(true): 1.00000 DEAL::shape_value(false): 0.00000 -DEAL::jump(): 1.00000 -DEAL::average(): 1.00000 +DEAL::jump_in_shape_values(): 1.00000 +DEAL::average_of_shape_values(): 1.00000 DEAL::FE_DGQ<2>(1) DEAL::shape_value(true): 0.500000 0.500000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): 0.500000 0.500000 0.00000 0.00000 -DEAL::average(): 0.500000 0.500000 0.00000 0.00000 +DEAL::jump_in_shape_values(): 0.500000 0.500000 0.00000 0.00000 +DEAL::average_of_shape_values(): 0.500000 0.500000 0.00000 0.00000 DEAL::FE_DGQ<3>(0) DEAL::shape_value(true): 1.00000 DEAL::shape_value(false): 0.00000 -DEAL::jump(): 1.00000 -DEAL::average(): 1.00000 +DEAL::jump_in_shape_values(): 1.00000 +DEAL::average_of_shape_values(): 1.00000 DEAL::FE_DGQ<3>(1) DEAL::shape_value(true): 0.250000 0.250000 0.00000 0.00000 0.250000 0.250000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): 0.250000 0.250000 0.00000 0.00000 0.250000 0.250000 0.00000 0.00000 -DEAL::average(): 0.250000 0.250000 0.00000 0.00000 0.250000 0.250000 0.00000 0.00000 +DEAL::jump_in_shape_values(): 0.250000 0.250000 0.00000 0.00000 0.250000 0.250000 0.00000 0.00000 +DEAL::average_of_shape_values(): 0.250000 0.250000 0.00000 0.00000 0.250000 0.250000 0.00000 0.00000 diff --git a/tests/feinterface/fe_interface_values_06.cc b/tests/feinterface/fe_interface_values_06.cc index edcdda30ad..6edda1755e 100644 --- a/tests/feinterface/fe_interface_values_06.cc +++ b/tests/feinterface/fe_interface_values_06.cc @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -// evaluate jump(), average(), shape_value() of FEInterfaceValues on an adaptive -// mesh for a continuous element +// evaluate jump_in_shape_values(), average_of_shape_values(), shape_value() of +// FEInterfaceValues on an adaptive mesh for a continuous element #include @@ -134,16 +134,16 @@ test(unsigned int fe_degree) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "jump(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_values(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "average(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_values(): " << cell_vector << std::endl; } } diff --git a/tests/feinterface/fe_interface_values_06.output b/tests/feinterface/fe_interface_values_06.output index 6488c7fc32..1bd6762b95 100644 --- a/tests/feinterface/fe_interface_values_06.output +++ b/tests/feinterface/fe_interface_values_06.output @@ -11,8 +11,8 @@ DEAL:: idx: 5 global: 7 dof indices: 2 | -1 DEAL:: idx: 6 global: 8 dof indices: 3 | -1 DEAL::shape_value(true): 0.250000 0.00000 0.00000 0.00000 0.00000 0.00000 0.250000 DEAL::shape_value(false): 0.375000 0.00000 0.125000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): -0.125000 0.00000 -0.125000 0.00000 0.00000 0.00000 0.250000 -DEAL::average(): 0.312500 0.00000 0.0625000 0.00000 0.00000 0.00000 0.125000 +DEAL::jump_in_shape_values(): -0.125000 0.00000 -0.125000 0.00000 0.00000 0.00000 0.250000 +DEAL::average_of_shape_values(): 0.312500 0.00000 0.0625000 0.00000 0.00000 0.00000 0.125000 DEAL::FE_Q<3>(1) DEAL::qpoint 0: 1.00000 0.105662 0.105662 DEAL::qpoint 1: 1.00000 0.394338 0.105662 @@ -35,5 +35,5 @@ DEAL:: idx: 13 global: 17 dof indices: 5 | -1 DEAL:: idx: 14 global: 18 dof indices: 7 | -1 DEAL::shape_value(true): 0.0625000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.0625000 0.0625000 DEAL::shape_value(false): 0.140625 0.00000 0.0468750 0.00000 0.0468750 0.00000 0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): -0.0781250 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.0625000 0.0625000 -DEAL::average(): 0.101562 0.00000 0.0234375 0.00000 0.0234375 0.00000 0.00781250 0.00000 0.00000 0.00000 0.00000 0.00000 0.0312500 0.0312500 0.0312500 +DEAL::jump_in_shape_values(): -0.0781250 0.00000 -0.0468750 0.00000 -0.0468750 0.00000 -0.0156250 0.00000 0.00000 0.00000 0.00000 0.00000 0.0625000 0.0625000 0.0625000 +DEAL::average_of_shape_values(): 0.101562 0.00000 0.0234375 0.00000 0.0234375 0.00000 0.00781250 0.00000 0.00000 0.00000 0.00000 0.00000 0.0312500 0.0312500 0.0312500 diff --git a/tests/feinterface/fe_interface_values_07.cc b/tests/feinterface/fe_interface_values_07.cc index f38bb06ecf..10ede02e2c 100644 --- a/tests/feinterface/fe_interface_values_07.cc +++ b/tests/feinterface/fe_interface_values_07.cc @@ -14,8 +14,8 @@ // --------------------------------------------------------------------- -// evaluate jump(), average(), shape_value() of FEInterfaceValues -// like fe_interface_values_02, but for a continuous element +// evaluate jump_in_shape_values(), average_of_shape_values(), shape_value() of +// FEInterfaceValues like fe_interface_values_02, but for a continuous element #include @@ -116,16 +116,16 @@ test(unsigned int fe_degree) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "jump(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_values(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average(i, qpoint) * fiv.get_JxW_values()[qpoint]; - deallog << "average(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_values(i, qpoint) * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_values(): " << cell_vector << std::endl; } } diff --git a/tests/feinterface/fe_interface_values_07.output b/tests/feinterface/fe_interface_values_07.output index 2cae4be57f..b30862e2b3 100644 --- a/tests/feinterface/fe_interface_values_07.output +++ b/tests/feinterface/fe_interface_values_07.output @@ -2,10 +2,10 @@ DEAL::FE_Q<2>(1) DEAL::shape_value(true): 0.00000 0.500000 0.00000 0.500000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.500000 0.00000 0.500000 0.00000 0.00000 -DEAL::jump(): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::average(): 0.00000 0.500000 0.00000 0.500000 0.00000 0.00000 +DEAL::jump_in_shape_values(): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 +DEAL::average_of_shape_values(): 0.00000 0.500000 0.00000 0.500000 0.00000 0.00000 DEAL::FE_Q<3>(1) DEAL::shape_value(true): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.00000 0.00000 0.00000 DEAL::shape_value(false): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.00000 0.00000 0.00000 -DEAL::jump(): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -DEAL::average(): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.00000 0.00000 0.00000 +DEAL::jump_in_shape_values(): 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 +DEAL::average_of_shape_values(): 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.250000 0.00000 0.00000 0.00000 0.00000 diff --git a/tests/feinterface/fe_interface_values_08.cc b/tests/feinterface/fe_interface_values_08.cc index cd448e3379..d751b91c58 100644 --- a/tests/feinterface/fe_interface_values_08.cc +++ b/tests/feinterface/fe_interface_values_08.cc @@ -14,7 +14,8 @@ // --------------------------------------------------------------------- -// evaluate average_gradient average_hessian jump_gradient of FEInterfaceValues +// evaluate average_gradient average_of_shape_hessians( jump_gradient of +// FEInterfaceValues #include @@ -97,23 +98,24 @@ test(const FiniteElement &fe) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average_gradient(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "average_gradient.norm(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_gradients(i, qpoint).norm() * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_gradients.norm(): " << cell_vector + << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.average_hessian(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "average_hessian.norm(): " << cell_vector << std::endl; + cell_vector(i) += fiv.average_of_shape_hessians(i, qpoint).norm() * + fiv.get_JxW_values()[qpoint]; + deallog << "average_of_shape_hessians.norm(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump_gradient(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "jump_gradient.norm(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_gradients(i, qpoint).norm() * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_gradients.norm(): " << cell_vector << std::endl; } @@ -135,23 +137,26 @@ test(const FiniteElement &fe) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.average_gradient(i, qpoint).norm() * + cell_vector(i) += fiv.average_of_shape_gradients(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "average_gradient.norm(): " << cell_vector << std::endl; + deallog << "average_of_shape_gradients.norm(): " << cell_vector + << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.average_hessian(i, qpoint).norm() * + cell_vector(i) += fiv.average_of_shape_hessians(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "average_hessian.norm(): " << cell_vector << std::endl; + deallog << "average_of_shape_hessians.norm(): " << cell_vector + << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < q_points.size(); ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.jump_gradient(i, qpoint).norm() * + cell_vector(i) += fiv.jump_in_shape_gradients(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "jump_gradient.norm(): " << cell_vector << std::endl; + deallog << "jump_in_shape_gradients.norm(): " << cell_vector + << std::endl; } } diff --git a/tests/feinterface/fe_interface_values_08.output b/tests/feinterface/fe_interface_values_08.output index f3ef235513..7c4e78a3c6 100644 --- a/tests/feinterface/fe_interface_values_08.output +++ b/tests/feinterface/fe_interface_values_08.output @@ -1,50 +1,50 @@ DEAL::FE_Q<2>(1) -DEAL::average_gradient.norm(): 1.14783 0.500000 1.14783 0.500000 -DEAL::average_hessian.norm(): 1.41421 1.41421 1.41421 1.41421 -DEAL::jump_gradient.norm(): 1.14783 0.500000 1.14783 0.500000 -DEAL::average_gradient.norm(): 0.250000 1.00000 0.250000 1.00000 0.250000 0.250000 -DEAL::average_hessian.norm(): 0.707107 0.00000 0.707107 0.00000 0.707107 0.707107 -DEAL::jump_gradient.norm(): 0.500000 1.00000 0.500000 1.00000 0.500000 0.500000 +DEAL::average_of_shape_gradients.norm(): 1.14783 0.500000 1.14783 0.500000 +DEAL::average_of_shape_hessians.norm(): 1.41421 1.41421 1.41421 1.41421 +DEAL::jump_in_shape_gradients.norm(): 1.14783 0.500000 1.14783 0.500000 +DEAL::average_of_shape_gradients.norm(): 0.250000 1.00000 0.250000 1.00000 0.250000 0.250000 +DEAL::average_of_shape_hessians.norm(): 0.707107 0.00000 0.707107 0.00000 0.707107 0.707107 +DEAL::jump_in_shape_gradients.norm(): 0.500000 1.00000 0.500000 1.00000 0.500000 0.500000 DEAL::FE_DGQ<2>(0) -DEAL::average_gradient.norm(): 0.00000 -DEAL::average_hessian.norm(): 0.00000 -DEAL::jump_gradient.norm(): 0.00000 -DEAL::average_gradient.norm(): 0.00000 0.00000 -DEAL::average_hessian.norm(): 0.00000 0.00000 -DEAL::jump_gradient.norm(): 0.00000 0.00000 +DEAL::average_of_shape_gradients.norm(): 0.00000 +DEAL::average_of_shape_hessians.norm(): 0.00000 +DEAL::jump_in_shape_gradients.norm(): 0.00000 +DEAL::average_of_shape_gradients.norm(): 0.00000 0.00000 +DEAL::average_of_shape_hessians.norm(): 0.00000 0.00000 +DEAL::jump_in_shape_gradients.norm(): 0.00000 0.00000 DEAL::FE_DGQ<2>(1) -DEAL::average_gradient.norm(): 1.14783 0.500000 1.14783 0.500000 -DEAL::average_hessian.norm(): 1.41421 1.41421 1.41421 1.41421 -DEAL::jump_gradient.norm(): 1.14783 0.500000 1.14783 0.500000 -DEAL::average_gradient.norm(): 0.250000 0.573917 0.250000 0.573917 0.573917 0.250000 0.573917 0.250000 -DEAL::average_hessian.norm(): 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 -DEAL::jump_gradient.norm(): 0.500000 1.14783 0.500000 1.14783 1.14783 0.500000 1.14783 0.500000 +DEAL::average_of_shape_gradients.norm(): 1.14783 0.500000 1.14783 0.500000 +DEAL::average_of_shape_hessians.norm(): 1.41421 1.41421 1.41421 1.41421 +DEAL::jump_in_shape_gradients.norm(): 1.14783 0.500000 1.14783 0.500000 +DEAL::average_of_shape_gradients.norm(): 0.250000 0.573917 0.250000 0.573917 0.573917 0.250000 0.573917 0.250000 +DEAL::average_of_shape_hessians.norm(): 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 0.707107 +DEAL::jump_in_shape_gradients.norm(): 0.500000 1.14783 0.500000 1.14783 1.14783 0.500000 1.14783 0.500000 DEAL::FE_DGQ<2>(2) -DEAL::average_gradient.norm(): 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 -DEAL::average_hessian.norm(): 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 -DEAL::jump_gradient.norm(): 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 -DEAL::average_gradient.norm(): 0.107583 0.430331 0.762102 0.333333 1.33333 1.58962 0.107583 0.430331 0.762102 0.762102 0.430331 0.107583 1.58962 1.33333 0.333333 0.762102 0.430331 0.107583 -DEAL::average_hessian.norm(): 1.06223 3.84282 3.58699 2.18466 6.72690 6.28519 1.06223 3.84282 3.58699 3.58699 3.84282 1.06223 6.28519 6.72690 2.18466 3.58699 3.84282 1.06223 -DEAL::jump_gradient.norm(): 0.215166 0.860663 1.52420 0.666667 2.66667 3.17925 0.215166 0.860663 1.52420 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 +DEAL::average_of_shape_gradients.norm(): 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 +DEAL::average_of_shape_hessians.norm(): 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 +DEAL::jump_in_shape_gradients.norm(): 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 +DEAL::average_of_shape_gradients.norm(): 0.107583 0.430331 0.762102 0.333333 1.33333 1.58962 0.107583 0.430331 0.762102 0.762102 0.430331 0.107583 1.58962 1.33333 0.333333 0.762102 0.430331 0.107583 +DEAL::average_of_shape_hessians.norm(): 1.06223 3.84282 3.58699 2.18466 6.72690 6.28519 1.06223 3.84282 3.58699 3.58699 3.84282 1.06223 6.28519 6.72690 2.18466 3.58699 3.84282 1.06223 +DEAL::jump_in_shape_gradients.norm(): 0.215166 0.860663 1.52420 0.666667 2.66667 3.17925 0.215166 0.860663 1.52420 1.52420 0.860663 0.215166 3.17925 2.66667 0.666667 1.52420 0.860663 0.215166 DEAL::FE_Q<3>(1) -DEAL::average_gradient.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 -DEAL::average_hessian.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 -DEAL::jump_gradient.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 -DEAL::average_gradient.norm(): 0.125000 0.761802 0.125000 0.761802 0.125000 0.761802 0.125000 0.761802 0.125000 0.125000 0.125000 0.125000 -DEAL::average_hessian.norm(): 0.538675 1.41421 0.538675 1.41421 0.538675 1.41421 0.538675 1.41421 0.538675 0.538675 0.538675 0.538675 -DEAL::jump_gradient.norm(): 0.250000 0.500000 0.250000 0.500000 0.250000 0.500000 0.250000 0.500000 0.250000 0.250000 0.250000 0.250000 +DEAL::average_of_shape_gradients.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 +DEAL::average_of_shape_hessians.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 +DEAL::jump_in_shape_gradients.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 +DEAL::average_of_shape_gradients.norm(): 0.125000 0.761802 0.125000 0.761802 0.125000 0.761802 0.125000 0.761802 0.125000 0.125000 0.125000 0.125000 +DEAL::average_of_shape_hessians.norm(): 0.538675 1.41421 0.538675 1.41421 0.538675 1.41421 0.538675 1.41421 0.538675 0.538675 0.538675 0.538675 +DEAL::jump_in_shape_gradients.norm(): 0.250000 0.500000 0.250000 0.500000 0.250000 0.500000 0.250000 0.500000 0.250000 0.250000 0.250000 0.250000 DEAL::FE_DGQ<3>(0) -DEAL::average_gradient.norm(): 0.00000 -DEAL::average_hessian.norm(): 0.00000 -DEAL::jump_gradient.norm(): 0.00000 -DEAL::average_gradient.norm(): 0.00000 0.00000 -DEAL::average_hessian.norm(): 0.00000 0.00000 -DEAL::jump_gradient.norm(): 0.00000 0.00000 +DEAL::average_of_shape_gradients.norm(): 0.00000 +DEAL::average_of_shape_hessians.norm(): 0.00000 +DEAL::jump_in_shape_gradients.norm(): 0.00000 +DEAL::average_of_shape_gradients.norm(): 0.00000 0.00000 +DEAL::average_of_shape_hessians.norm(): 0.00000 0.00000 +DEAL::jump_in_shape_gradients.norm(): 0.00000 0.00000 DEAL::FE_DGQ<3>(1) -DEAL::average_gradient.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 -DEAL::average_hessian.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 -DEAL::jump_gradient.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 -DEAL::average_gradient.norm(): 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 -DEAL::average_hessian.norm(): 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 -DEAL::jump_gradient.norm(): 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 +DEAL::average_of_shape_gradients.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 +DEAL::average_of_shape_hessians.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 +DEAL::jump_in_shape_gradients.norm(): 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 +DEAL::average_of_shape_gradients.norm(): 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 0.405739 0.125000 +DEAL::average_of_shape_hessians.norm(): 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 0.905750 0.538675 +DEAL::jump_in_shape_gradients.norm(): 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 0.811479 0.250000 diff --git a/tests/feinterface/fe_interface_values_09.cc b/tests/feinterface/fe_interface_values_09.cc index dd114c7ce7..6478c5a5b3 100644 --- a/tests/feinterface/fe_interface_values_09.cc +++ b/tests/feinterface/fe_interface_values_09.cc @@ -74,16 +74,17 @@ print_norm_of_average_over_quadrature_points(const FEInterfaceValues &fiv) cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < fiv.n_quadrature_points; ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += - fiv.jump_hessian(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "jump_hessian.norm(): " << cell_vector << std::endl; + cell_vector(i) += fiv.jump_in_shape_hessians(i, qpoint).norm() * + fiv.get_JxW_values()[qpoint]; + deallog << "jump_in_shape_hessians.norm(): " << cell_vector << std::endl; cell_vector = 0.0; for (unsigned int qpoint = 0; qpoint < fiv.n_quadrature_points; ++qpoint) for (unsigned int i = 0; i < n_dofs; ++i) - cell_vector(i) += fiv.jump_3rd_derivative(i, qpoint).norm() * + cell_vector(i) += fiv.jump_in_shape_3rd_derivatives(i, qpoint).norm() * fiv.get_JxW_values()[qpoint]; - deallog << "jump_3rd_derivative.norm(): " << cell_vector << std::endl; + deallog << "jump_in_shape_3rd_derivatives.norm(): " << cell_vector + << std::endl; } diff --git a/tests/feinterface/fe_interface_values_09.output b/tests/feinterface/fe_interface_values_09.output index bbe3319170..f68424300c 100644 --- a/tests/feinterface/fe_interface_values_09.output +++ b/tests/feinterface/fe_interface_values_09.output @@ -1,21 +1,21 @@ DEAL::FE_Q<2>(2) -DEAL::jump_hessian.norm(): 7.17398 2.12446 7.17398 2.12446 12.5704 4.36931 7.68564 7.68564 13.4538 -DEAL::jump_3rd_derivative.norm(): 23.1831 11.8202 23.1831 11.8202 44.4667 20.3528 34.2248 34.2248 63.5828 -DEAL::jump_hessian.norm(): 2.12446 11.0742 2.12446 11.0742 4.36931 14.6059 7.68564 7.68564 13.4538 2.12446 2.12446 4.36931 7.68564 7.68564 13.4538 -DEAL::jump_3rd_derivative.norm(): 11.8202 41.5692 11.8202 41.5692 20.3528 83.1384 34.2248 34.2248 63.5828 11.8202 11.8202 20.3528 34.2248 34.2248 63.5828 +DEAL::jump_in_shape_hessians.norm(): 7.17398 2.12446 7.17398 2.12446 12.5704 4.36931 7.68564 7.68564 13.4538 +DEAL::jump_in_shape_3rd_derivatives.norm(): 23.1831 11.8202 23.1831 11.8202 44.4667 20.3528 34.2248 34.2248 63.5828 +DEAL::jump_in_shape_hessians.norm(): 2.12446 11.0742 2.12446 11.0742 4.36931 14.6059 7.68564 7.68564 13.4538 2.12446 2.12446 4.36931 7.68564 7.68564 13.4538 +DEAL::jump_in_shape_3rd_derivatives.norm(): 11.8202 41.5692 11.8202 41.5692 20.3528 83.1384 34.2248 34.2248 63.5828 11.8202 11.8202 20.3528 34.2248 34.2248 63.5828 DEAL::FE_DGQ<2>(2) -DEAL::jump_hessian.norm(): 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 -DEAL::jump_3rd_derivative.norm(): 23.1831 34.2248 11.8202 44.4667 63.5828 20.3528 23.1831 34.2248 11.8202 -DEAL::jump_hessian.norm(): 2.12446 7.68564 7.17398 4.36931 13.4538 12.5704 2.12446 7.68564 7.17398 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 -DEAL::jump_3rd_derivative.norm(): 11.8202 34.2248 23.1831 20.3528 63.5828 44.4667 11.8202 34.2248 23.1831 23.1831 34.2248 11.8202 44.4667 63.5828 20.3528 23.1831 34.2248 11.8202 +DEAL::jump_in_shape_hessians.norm(): 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 +DEAL::jump_in_shape_3rd_derivatives.norm(): 23.1831 34.2248 11.8202 44.4667 63.5828 20.3528 23.1831 34.2248 11.8202 +DEAL::jump_in_shape_hessians.norm(): 2.12446 7.68564 7.17398 4.36931 13.4538 12.5704 2.12446 7.68564 7.17398 7.17398 7.68564 2.12446 12.5704 13.4538 4.36931 7.17398 7.68564 2.12446 +DEAL::jump_in_shape_3rd_derivatives.norm(): 11.8202 34.2248 23.1831 20.3528 63.5828 44.4667 11.8202 34.2248 23.1831 23.1831 34.2248 11.8202 44.4667 63.5828 20.3528 23.1831 34.2248 11.8202 DEAL::FE_Q<3>(1) -DEAL::jump_hessian.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 -DEAL::jump_3rd_derivative.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 -DEAL::jump_hessian.norm(): 1.07735 2.15470 1.07735 2.15470 1.07735 2.15470 1.07735 2.15470 1.07735 1.07735 1.07735 1.07735 -DEAL::jump_3rd_derivative.norm(): 2.44949 4.89898 2.44949 4.89898 2.44949 4.89898 2.44949 4.89898 2.44949 2.44949 2.44949 2.44949 +DEAL::jump_in_shape_hessians.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 +DEAL::jump_in_shape_3rd_derivatives.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 +DEAL::jump_in_shape_hessians.norm(): 1.07735 2.15470 1.07735 2.15470 1.07735 2.15470 1.07735 2.15470 1.07735 1.07735 1.07735 1.07735 +DEAL::jump_in_shape_3rd_derivatives.norm(): 2.44949 4.89898 2.44949 4.89898 2.44949 4.89898 2.44949 4.89898 2.44949 2.44949 2.44949 2.44949 DEAL::FE_DGQ<3>(1) -DEAL::jump_hessian.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 -DEAL::jump_3rd_derivative.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 -DEAL::jump_hessian.norm(): 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 -DEAL::jump_3rd_derivative.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 +DEAL::jump_in_shape_hessians.norm(): 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 +DEAL::jump_in_shape_3rd_derivatives.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 +DEAL::jump_in_shape_hessians.norm(): 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 1.81150 1.07735 +DEAL::jump_in_shape_3rd_derivatives.norm(): 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 2.44949 diff --git a/tests/feinterface/fe_interface_view_01.cc b/tests/feinterface/fe_interface_view_01.cc index 748d7b39cb..ca1541c342 100644 --- a/tests/feinterface/fe_interface_view_01.cc +++ b/tests/feinterface/fe_interface_view_01.cc @@ -79,17 +79,22 @@ test(const Triangulation &tr, const FiniteElement &fe) if (fe_iv[single_component].value(false, i, q) != 0) deallog << fe_iv[single_component].value(false, i, q) << " "; - if (fe_iv[single_component].jump(i, q) != 0) - deallog << fe_iv[single_component].jump(i, q) << " "; - if (fe_iv[single_component].average(i, q) != 0) - deallog << fe_iv[single_component].average(i, q) << " "; - if (fe_iv[single_component].jump_gradient(i, q).norm() != 0) - deallog << fe_iv[single_component].jump_gradient(i, q) + if (fe_iv[single_component].jump_in_values(i, q) != 0) + deallog << fe_iv[single_component].jump_in_values(i, q) << " "; - if (fe_iv[single_component].average_gradient(i, q).norm() != + if (fe_iv[single_component].average_of_values(i, q) != 0) + deallog << fe_iv[single_component].average_of_values(i, q) + << " "; + if (fe_iv[single_component].jump_in_gradients(i, q).norm() != 0) - deallog << fe_iv[single_component].average_gradient(i, q) - << std::endl; + deallog << fe_iv[single_component].jump_in_gradients(i, q) + << " "; + if (fe_iv[single_component] + .average_of_gradients(i, q) + .norm() != 0) + deallog + << fe_iv[single_component].average_of_gradients(i, q) + << std::endl; Assert(fe_iv[single_component].value(true, i, q) == @@ -98,25 +103,24 @@ test(const Triangulation &tr, const FiniteElement &fe) Assert(fe_iv[single_component].value(false, i, q) == fe_iv.shape_value(false, i, q, c), ExcInternalError()); - Assert(fe_iv[single_component].jump(i, q) == - fe_iv.jump(i, q, c), + Assert(fe_iv[single_component].jump_in_values(i, q) == + fe_iv.jump_in_shape_values(i, q, c), ExcInternalError()); - Assert(fe_iv[single_component].average(i, q) == - fe_iv.average(i, q, c), + Assert(fe_iv[single_component].average_of_values(i, q) == + fe_iv.average_of_shape_values(i, q, c), ExcInternalError()); - Assert(fe_iv[single_component].average_hessian(i, q) == - fe_iv.average_hessian(i, q, c), + Assert(fe_iv[single_component].average_of_hessians(i, q) == + fe_iv.average_of_shape_hessians(i, q, c), ExcInternalError()); - Assert(fe_iv[single_component].jump_hessian(i, q) == - fe_iv.jump_hessian(i, q, c), + Assert(fe_iv[single_component].jump_in_hessians(i, q) == + fe_iv.jump_in_shape_hessians(i, q, c), ExcInternalError()); - Assert(fe_iv[single_component].jump_3rd_derivative(i, q) == - fe_iv.jump_3rd_derivative(i, q, c), + Assert(fe_iv[single_component].jump_in_third_derivatives(i, + q) == + fe_iv.jump_in_shape_3rd_derivatives(i, q, c), ExcInternalError()); - - } // q loop } // component loop diff --git a/tests/feinterface/fe_interface_view_02.cc b/tests/feinterface/fe_interface_view_02.cc index f788af0daa..28d17a8d52 100644 --- a/tests/feinterface/fe_interface_view_02.cc +++ b/tests/feinterface/fe_interface_view_02.cc @@ -89,17 +89,26 @@ test(const Triangulation &tr, const FiniteElement &fe) if (fe_iv[vec_components].value(false, i, q).norm() != 0) deallog << fe_iv[vec_components].value(false, i, q) << " "; - if (fe_iv[vec_components].jump(i, q).norm() != 0) - deallog << fe_iv[vec_components].jump(i, q) << " "; - if (fe_iv[vec_components].average(i, q).norm() != 0) - deallog << fe_iv[vec_components].average(i, q) << " "; - if (fe_iv[vec_components].jump_gradient(i, q).norm() != 0) - deallog << fe_iv[vec_components].jump_gradient(i, q) - << " "; - if (fe_iv[vec_components].average_gradient(i, q).norm() != + if (fe_iv[vec_components].jump_in_values(i, q).norm() != 0) - deallog << fe_iv[vec_components].average_gradient(i, q) - << std::endl; + deallog << fe_iv[vec_components].jump_in_values(i, q) + << " "; + if (fe_iv[vec_components] + .average_of_values(i, q) + .norm() != 0) + deallog << fe_iv[vec_components].average_of_values(i, q) + << " "; + if (fe_iv[vec_components] + .jump_in_gradients(i, q) + .norm() != 0) + deallog << fe_iv[vec_components].jump_in_gradients(i, q) + << " "; + if (fe_iv[vec_components] + .average_of_gradients(i, q) + .norm() != 0) + deallog + << fe_iv[vec_components].average_of_gradients(i, q) + << std::endl; for (unsigned int d = 0; d < dim; ++d) { @@ -109,24 +118,28 @@ test(const Triangulation &tr, const FiniteElement &fe) Assert(fe_iv[vec_components].value(false, i, q)[d] == fe_iv.shape_value(false, i, q, c + d), ExcInternalError()); - Assert(fe_iv[vec_components].jump(i, q)[d] == - fe_iv.jump(i, q, c + d), + Assert(fe_iv[vec_components].jump_in_values(i, + q)[d] == + fe_iv.jump_in_shape_values(i, q, c + d), ExcInternalError()); - Assert(fe_iv[vec_components].average(i, q)[d] == - fe_iv.average(i, q, c + d), - ExcInternalError()); - Assert(fe_iv[vec_components].average_hessian(i, - q)[d] == - fe_iv.average_hessian(i, q, c + d), + Assert( + fe_iv[vec_components].average_of_values(i, q)[d] == + fe_iv.average_of_shape_values(i, q, c + d), + ExcInternalError()); + Assert(fe_iv[vec_components].average_of_hessians( + i, q)[d] == + fe_iv.average_of_shape_hessians(i, q, c + d), ExcInternalError()); - Assert(fe_iv[vec_components].jump_hessian(i, q)[d] == - fe_iv.jump_hessian(i, q, c + d), + Assert(fe_iv[vec_components].jump_in_hessians(i, + q)[d] == + fe_iv.jump_in_shape_hessians(i, q, c + d), ExcInternalError()); - Assert(fe_iv[vec_components].jump_3rd_derivative( - i, q)[d] == - fe_iv.jump_3rd_derivative(i, q, c + d), - ExcInternalError()); + Assert( + fe_iv[vec_components].jump_in_third_derivatives( + i, q)[d] == + fe_iv.jump_in_shape_3rd_derivatives(i, q, c + d), + ExcInternalError()); } } } diff --git a/tests/feinterface/step-12.cc b/tests/feinterface/step-12.cc index 7554c4374a..badfc44fe9 100644 --- a/tests/feinterface/step-12.cc +++ b/tests/feinterface/step-12.cc @@ -365,7 +365,7 @@ namespace Step12 for (unsigned int i = 0; i < n_dofs; ++i) for (unsigned int j = 0; j < n_dofs; ++j) copy_data_face.cell_matrix(i, j) += - fe_facet.jump(i, qpoint) // [\phi_i] + fe_facet.jump_in_shape_values(i, qpoint) // [\phi_i] * fe_facet.shape_value((beta_n > 0), j, qpoint) // phi_j^{UP} * beta_n // (\beta . n) * JxW[qpoint]; // dx diff --git a/tests/meshworker/scratch_data_08.cc b/tests/meshworker/scratch_data_08.cc index 2eaee8f395..6ee4288b10 100644 --- a/tests/meshworker/scratch_data_08.cc +++ b/tests/meshworker/scratch_data_08.cc @@ -210,9 +210,10 @@ test() for (unsigned int j = 0; j < n_dofs; ++j) { face_matrix(i, j) += - (-fev.jump_gradient(i, q) * n[q] * fev.average(j, q) - - fev.average(i, q) * fev.jump_gradient(j, q) * n[q] + - gh * fev.jump(i, q) * fev.jump(j, q)) * + (-fev.jump_in_shape_gradients(i, q) * n[q] * fev.average(j, q) - + fev.average(i, q) * fev.jump_in_shape_gradients(j, q) * n[q] + + gh * fev.jump_in_shape_values(i, q) * + fev.jump_in_shape_values(j, q)) * JxW[q]; } }; diff --git a/tests/simplex/matrix_free_03.cc b/tests/simplex/matrix_free_03.cc index e9062cfee8..45d195b14c 100644 --- a/tests/simplex/matrix_free_03.cc +++ b/tests/simplex/matrix_free_03.cc @@ -534,19 +534,21 @@ test(const unsigned int degree) for (unsigned int i = 0; i < n_dofs_face; ++i) for (unsigned int j = 0; j < n_dofs_face; ++j) copy_data_face.cell_matrix(i, j) += - (-diffusion_coefficient * // - nu - fe_iv.jump(i, point) * // [v_h] - (fe_iv.average_gradient(j, point) * // ({grad u_h} . - normals[point]) // n) - - - diffusion_coefficient * // - nu - (fe_iv.average_gradient(i, point) * // (grad v_h . - normals[point]) * // n) - fe_iv.jump(j, point) // [u_h] - - + diffusion_coefficient * penalty * // + nu sigma - fe_iv.jump(i, point) * // [v_h] - fe_iv.jump(j, point) // [u_h] + (-diffusion_coefficient * // - nu + fe_iv.jump_in_shape_values(i, point) * // [v_h] + (fe_iv.average_of_shape_gradients(j, + point) * // ({grad u_h} . + normals[point]) // n) + + - + diffusion_coefficient * // - nu + (fe_iv.average_of_shape_gradients(i, point) * // (grad v_h . + normals[point]) * // n) + fe_iv.jump_in_shape_values(j, point) // [u_h] + + + diffusion_coefficient * penalty * // + nu sigma + fe_iv.jump_in_shape_values(i, point) * // [v_h] + fe_iv.jump_in_shape_values(j, point) // [u_h] ) * JxW[point]; // dx diff --git a/tests/simplex/poisson_02.cc b/tests/simplex/poisson_02.cc index efe02a8aa0..257e14330e 100644 --- a/tests/simplex/poisson_02.cc +++ b/tests/simplex/poisson_02.cc @@ -439,18 +439,19 @@ DGHeat::assemble_system() for (unsigned int j = 0; j < n_dofs; ++j) { copy_data_face.cell_matrix(i, j) += - -normals[qpoint] * fe_iv.average_gradient(i, qpoint) * - fe_iv.jump(j, qpoint) * JxW[qpoint]; + -normals[qpoint] * + fe_iv.average_of_shape_gradients(i, qpoint) * + fe_iv.jump_in_shape_values(j, qpoint) * JxW[qpoint]; copy_data_face.cell_matrix(i, j) += - -fe_iv.jump(i, qpoint) // \phi_i - * fe_iv.average_gradient(j, qpoint) * + -fe_iv.jump_in_shape_values(i, qpoint) // \phi_i + * fe_iv.average_of_shape_gradients(j, qpoint) * normals[qpoint] // n*\nabla \phi_j * JxW[qpoint]; // dx copy_data_face.cell_matrix(i, j) += - beta * 1. / h * fe_iv.jump(i, qpoint) * - fe_iv.jump(j, qpoint) * JxW[qpoint]; + beta * 1. / h * fe_iv.jump_in_shape_values(i, qpoint) * + fe_iv.jump_in_shape_values(j, qpoint) * JxW[qpoint]; } } } diff --git a/tests/simplex/step-12.cc b/tests/simplex/step-12.cc index fa7b2d9fbc..9e3ab2fd4b 100644 --- a/tests/simplex/step-12.cc +++ b/tests/simplex/step-12.cc @@ -348,7 +348,7 @@ namespace Step12 for (unsigned int i = 0; i < n_dofs; ++i) for (unsigned int j = 0; j < n_dofs; ++j) copy_data_face.cell_matrix(i, j) += - fe_iv.jump(i, qpoint) // [\phi_i] + fe_iv.jump_in_shape_values(i, qpoint) // [\phi_i] * fe_iv.shape_value((beta_dot_n > 0), j, qpoint) // phi_j^{upwind} * beta_dot_n // (\beta . n) diff --git a/tests/simplex/step-12a.cc b/tests/simplex/step-12a.cc index 8b5660d836..3b4dc50238 100644 --- a/tests/simplex/step-12a.cc +++ b/tests/simplex/step-12a.cc @@ -363,7 +363,7 @@ namespace Step12 for (unsigned int i = 0; i < n_dofs; ++i) for (unsigned int j = 0; j < n_dofs; ++j) copy_data_face.cell_matrix(i, j) += - fe_iv.jump(i, qpoint) // [\phi_i] + fe_iv.jump_in_shape_values(i, qpoint) // [\phi_i] * fe_iv.shape_value((beta_dot_n > 0), j, qpoint) // phi_j^{upwind} * beta_dot_n // (\beta . n) diff --git a/tests/simplex/step-74.cc b/tests/simplex/step-74.cc index ac2f573c80..13d9bde589 100644 --- a/tests/simplex/step-74.cc +++ b/tests/simplex/step-74.cc @@ -479,19 +479,21 @@ namespace Step74 for (unsigned int i = 0; i < n_dofs_face; ++i) for (unsigned int j = 0; j < n_dofs_face; ++j) copy_data_face.cell_matrix(i, j) += - (-diffusion_coefficient * // - nu - fe_iv.jump(i, point) * // [v_h] - (fe_iv.average_gradient(j, point) * // ({grad u_h} . - normals[point]) // n) - - - diffusion_coefficient * // - nu - (fe_iv.average_gradient(i, point) * // (grad v_h . - normals[point]) * // n) - fe_iv.jump(j, point) // [u_h] - - + diffusion_coefficient * penalty * // + nu sigma - fe_iv.jump(i, point) * // [v_h] - fe_iv.jump(j, point) // [u_h] + (-diffusion_coefficient * // - nu + fe_iv.jump_in_shape_values(i, point) * // [v_h] + (fe_iv.average_of_shape_gradients(j, + point) * // ({grad u_h} . + normals[point]) // n) + + - + diffusion_coefficient * // - nu + (fe_iv.average_of_shape_gradients(i, point) * // (grad v_h . + normals[point]) * // n) + fe_iv.jump_in_shape_values(j, point) // [u_h] + + + diffusion_coefficient * penalty * // + nu sigma + fe_iv.jump_in_shape_values(i, point) * // [v_h] + fe_iv.jump_in_shape_values(j, point) // [u_h] ) * JxW[point]; // dx -- 2.39.5