From 55d3e8ea8b3a1d24ada42fb1bb63000528c3ff5b Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 22 Mar 2018 15:26:00 -0500 Subject: [PATCH] Tests: Do not print memory consumptions in fe/fe_move_0? tests The memory consumption is simply not stable with respect to architecture and standard library. The test remains useful - the actual contents of the moved elements is still printed and compared in a unique (and stable) manner. Further, remove output variants for clang9_darwin - I checked that the output is now the same. --- tests/fe/fe_move_01.cc | 1 - tests/fe/fe_move_01.output | 9 ---- tests/fe/fe_move_01.output.clang9_darwin | 64 ------------------------ tests/fe/fe_move_02.cc | 1 - tests/fe/fe_move_02.output | 9 ---- tests/fe/fe_move_02.output.clang9_darwin | 64 ------------------------ 6 files changed, 148 deletions(-) delete mode 100644 tests/fe/fe_move_01.output.clang9_darwin delete mode 100644 tests/fe/fe_move_02.output.clang9_darwin diff --git a/tests/fe/fe_move_01.cc b/tests/fe/fe_move_01.cc index e64ff9b3ea..3b189e4fc7 100644 --- a/tests/fe/fe_move_01.cc +++ b/tests/fe/fe_move_01.cc @@ -30,7 +30,6 @@ check(const FiniteElement &fe) deallog << "blocks: " << fe.n_blocks() << std::endl; deallog << "conforms H1: " << fe.conforms(FiniteElementData::H1) << std::endl; deallog << "n_base_elements: " << fe.n_base_elements() << std::endl; - deallog << "memory consumption: " << fe.memory_consumption() << std::endl; deallog << std::endl; } diff --git a/tests/fe/fe_move_01.output b/tests/fe/fe_move_01.output index aab9406668..6424ea2bb7 100644 --- a/tests/fe/fe_move_01.output +++ b/tests/fe/fe_move_01.output @@ -4,61 +4,52 @@ DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 1408 DEAL:: DEAL::dim: 1 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 744 DEAL:: DEAL::dim: 1 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 1408 DEAL:: DEAL::dim: 2 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 3396 DEAL:: DEAL::dim: 2 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 928 DEAL:: DEAL::dim: 2 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 3396 DEAL:: DEAL::dim: 3 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 9116 DEAL:: DEAL::dim: 3 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 1296 DEAL:: DEAL::dim: 3 DEAL::components: 1 DEAL::blocks: 1 DEAL::conforms H1: 1 DEAL::n_base_elements: 1 -DEAL::memory consumption: 9116 DEAL:: diff --git a/tests/fe/fe_move_01.output.clang9_darwin b/tests/fe/fe_move_01.output.clang9_darwin deleted file mode 100644 index 0f52e15263..0000000000 --- a/tests/fe/fe_move_01.output.clang9_darwin +++ /dev/null @@ -1,64 +0,0 @@ - -DEAL::dim: 1 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 1144 -DEAL:: -DEAL::dim: 1 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 608 -DEAL:: -DEAL::dim: 1 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 1144 -DEAL:: -DEAL::dim: 2 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 2684 -DEAL:: -DEAL::dim: 2 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 728 -DEAL:: -DEAL::dim: 2 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 2684 -DEAL:: -DEAL::dim: 3 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 7124 -DEAL:: -DEAL::dim: 3 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 968 -DEAL:: -DEAL::dim: 3 -DEAL::components: 1 -DEAL::blocks: 1 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 1 -DEAL::memory consumption: 7124 -DEAL:: diff --git a/tests/fe/fe_move_02.cc b/tests/fe/fe_move_02.cc index 1e408d5ff7..d9de9b35eb 100644 --- a/tests/fe/fe_move_02.cc +++ b/tests/fe/fe_move_02.cc @@ -30,7 +30,6 @@ check(const FiniteElement &fe) deallog << "blocks: " << fe.n_blocks() << std::endl; deallog << "conforms H1: " << fe.conforms(FiniteElementData::H1) << std::endl; deallog << "n_base_elements: " << fe.n_base_elements() << std::endl; - deallog << "memory consumption: " << fe.memory_consumption() << std::endl; deallog << std::endl; } diff --git a/tests/fe/fe_move_02.output b/tests/fe/fe_move_02.output index 7936fc628f..edf0a8f836 100644 --- a/tests/fe/fe_move_02.output +++ b/tests/fe/fe_move_02.output @@ -4,61 +4,52 @@ DEAL::components: 2 DEAL::blocks: 2 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 4728 DEAL:: DEAL::FESystem<1>[] DEAL::components: 2 DEAL::blocks: 2 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 1044 DEAL:: DEAL::FESystem<1>[FE_Q<1>(2)-FE_Q<1>(1)] DEAL::components: 2 DEAL::blocks: 2 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 4728 DEAL:: DEAL::FESystem<2>[FE_Q<2>(2)^2-FE_Q<2>(1)] DEAL::components: 3 DEAL::blocks: 3 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 13440 DEAL:: DEAL::FESystem<2>[] DEAL::components: 3 DEAL::blocks: 3 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 2608 DEAL:: DEAL::FESystem<2>[FE_Q<2>(2)^2-FE_Q<2>(1)] DEAL::components: 3 DEAL::blocks: 3 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 13440 DEAL:: DEAL::FESystem<3>[FE_Q<3>(2)^3-FE_Q<3>(1)] DEAL::components: 4 DEAL::blocks: 4 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 57312 DEAL:: DEAL::FESystem<3>[] DEAL::components: 4 DEAL::blocks: 4 DEAL::conforms H1: 1 DEAL::n_base_elements: 0 -DEAL::memory consumption: 8780 DEAL:: DEAL::FESystem<3>[FE_Q<3>(2)^3-FE_Q<3>(1)] DEAL::components: 4 DEAL::blocks: 4 DEAL::conforms H1: 1 DEAL::n_base_elements: 2 -DEAL::memory consumption: 57312 DEAL:: diff --git a/tests/fe/fe_move_02.output.clang9_darwin b/tests/fe/fe_move_02.output.clang9_darwin deleted file mode 100644 index be6c931445..0000000000 --- a/tests/fe/fe_move_02.output.clang9_darwin +++ /dev/null @@ -1,64 +0,0 @@ - -DEAL::FESystem<1>[FE_Q<1>(2)-FE_Q<1>(1)] -DEAL::components: 2 -DEAL::blocks: 2 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 3808 -DEAL:: -DEAL::FESystem<1>[] -DEAL::components: 2 -DEAL::blocks: 2 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 812 -DEAL:: -DEAL::FESystem<1>[FE_Q<1>(2)-FE_Q<1>(1)] -DEAL::components: 2 -DEAL::blocks: 2 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 3808 -DEAL:: -DEAL::FESystem<2>[FE_Q<2>(2)^2-FE_Q<2>(1)] -DEAL::components: 3 -DEAL::blocks: 3 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 10568 -DEAL:: -DEAL::FESystem<2>[] -DEAL::components: 3 -DEAL::blocks: 3 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 1832 -DEAL:: -DEAL::FESystem<2>[FE_Q<2>(2)^2-FE_Q<2>(1)] -DEAL::components: 3 -DEAL::blocks: 3 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 10568 -DEAL:: -DEAL::FESystem<3>[FE_Q<3>(2)^3-FE_Q<3>(1)] -DEAL::components: 4 -DEAL::blocks: 4 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 48136 -DEAL:: -DEAL::FESystem<3>[] -DEAL::components: 4 -DEAL::blocks: 4 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 0 -DEAL::memory consumption: 5860 -DEAL:: -DEAL::FESystem<3>[FE_Q<3>(2)^3-FE_Q<3>(1)] -DEAL::components: 4 -DEAL::blocks: 4 -DEAL::conforms H1: 1 -DEAL::n_base_elements: 2 -DEAL::memory consumption: 48136 -DEAL:: -- 2.39.5