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.

diff --git a/tests/fe/fe_move_01.cc b/tests/fe/fe_move_01.cc
index e64ff9b3ea9ae13b25b1d58c661bdb09bd4444d6..3b189e4fc7ab3396d1936687970a8a29ff424f19 100644 (file)
--- a/tests/fe/fe_move_01.cc
+++ b/tests/fe/fe_move_01.cc
@@ -30,7 +30,6 @@ check(const FiniteElement<dim> &fe)
   deallog << "blocks: " << fe.n_blocks() << std::endl;
   deallog << "conforms H1: " << fe.conforms(FiniteElementData<dim>::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 aab94066682974a0343133cb586db10290bad65b..6424ea2bb7d54e2420582fb33893d41bd654150c 100644 (file)
--- 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 (file)
index 0f52e15..0000000
--- 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 1e408d5ff7aa36c1d32dc0009034fa0ea3f5ed89..d9de9b35eb24f8acbbfda0a4a73ec5fff3dbc41f 100644 (file)
--- a/tests/fe/fe_move_02.cc
+++ b/tests/fe/fe_move_02.cc
@@ -30,7 +30,6 @@ check(const FiniteElement<dim> &fe)
   deallog << "blocks: " << fe.n_blocks() << std::endl;
   deallog << "conforms H1: " << fe.conforms(FiniteElementData<dim>::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 7936fc628f0a644dcfb4453788dfd231de411f9a..edf0a8f83625710c942126dbea6ab8df113d716b 100644 (file)
--- 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 (file)
index be6c931..0000000
--- 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::