fix tests/meshworker/mesh_loop_

diff --git a/tests/meshworker/mesh_loop_02.cc b/tests/meshworker/mesh_loop_02.cc
index 9846217ed766072e8a51d86444d57f3e29eb581f..ee37afd9a1ac0e44adc41732535799cc6cd81bd6 100644 (file)
--- a/tests/meshworker/mesh_loop_02.cc
+++ b/tests/meshworker/mesh_loop_02.cc
@@ -124,6 +124,7 @@ void test()
 int main()
 {
   initlog();
+  MultithreadInfo::set_thread_limit(1); // to make output deterministic
 
   test<2,2>();
 }

diff --git a/tests/meshworker/mesh_loop_02.output b/tests/meshworker/mesh_loop_02.output
index 0bc699789143b82fc1df6db7be6098bbdca3193f..c3da07acc80f002bcab9b8a0a5b4ff03bab25c15 100644 (file)
--- a/tests/meshworker/mesh_loop_02.output
+++ b/tests/meshworker/mesh_loop_02.output
@@ -2,36 +2,36 @@
 DEAL::CELLS ONLY
 DEAL::
 DEAL::Cell worker on : 1.1
-DEAL::Cell worker on : 1.2
-DEAL::Cell worker on : 1.3
-DEAL::Cell worker on : 2.0
-DEAL::Cell worker on : 2.1
-DEAL::Cell worker on : 2.2
-DEAL::Cell worker on : 2.3
 DEAL::copier
+DEAL::Cell worker on : 1.2
 DEAL::copier
+DEAL::Cell worker on : 1.3
 DEAL::copier
+DEAL::Cell worker on : 2.0
 DEAL::copier
+DEAL::Cell worker on : 2.1
 DEAL::copier
+DEAL::Cell worker on : 2.2
 DEAL::copier
+DEAL::Cell worker on : 2.3
 DEAL::copier
 DEAL::BOUNDARY ONLY
 DEAL::
 DEAL::Boundary worker on : 1.1, Face : 1
 DEAL::Boundary worker on : 1.1, Face : 2
+DEAL::copier
 DEAL::Boundary worker on : 1.2, Face : 0
 DEAL::Boundary worker on : 1.2, Face : 3
+DEAL::copier
 DEAL::Boundary worker on : 1.3, Face : 1
 DEAL::Boundary worker on : 1.3, Face : 3
+DEAL::copier
 DEAL::Boundary worker on : 2.0, Face : 0
 DEAL::Boundary worker on : 2.0, Face : 2
-DEAL::Boundary worker on : 2.1, Face : 2
-DEAL::Boundary worker on : 2.2, Face : 0
-DEAL::copier
-DEAL::copier
-DEAL::copier
 DEAL::copier
+DEAL::Boundary worker on : 2.1, Face : 2
 DEAL::copier
+DEAL::Boundary worker on : 2.2, Face : 0
 DEAL::copier
 DEAL::copier
 DEAL::CELLS AND BOUNDARY
@@ -39,88 +39,94 @@ DEAL::
 DEAL::Boundary worker on : 1.1, Face : 1
 DEAL::Boundary worker on : 1.1, Face : 2
 DEAL::Cell worker on : 1.1
+DEAL::copier
 DEAL::Boundary worker on : 1.2, Face : 0
 DEAL::Boundary worker on : 1.2, Face : 3
 DEAL::Cell worker on : 1.2
+DEAL::copier
 DEAL::Boundary worker on : 1.3, Face : 1
 DEAL::Boundary worker on : 1.3, Face : 3
 DEAL::Cell worker on : 1.3
+DEAL::copier
 DEAL::Boundary worker on : 2.0, Face : 0
 DEAL::Boundary worker on : 2.0, Face : 2
 DEAL::Cell worker on : 2.0
+DEAL::copier
 DEAL::Boundary worker on : 2.1, Face : 2
 DEAL::Cell worker on : 2.1
+DEAL::copier
 DEAL::Boundary worker on : 2.2, Face : 0
 DEAL::Cell worker on : 2.2
-DEAL::Cell worker on : 2.3
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
 DEAL::copier
+DEAL::Cell worker on : 2.3
 DEAL::copier
 DEAL::CELLS FIRST AND BOUNDARY
 DEAL::
 DEAL::Cell worker on : 1.1
 DEAL::Boundary worker on : 1.1, Face : 1
 DEAL::Boundary worker on : 1.1, Face : 2
+DEAL::copier
 DEAL::Cell worker on : 1.2
 DEAL::Boundary worker on : 1.2, Face : 0
 DEAL::Boundary worker on : 1.2, Face : 3
+DEAL::copier
 DEAL::Cell worker on : 1.3
 DEAL::Boundary worker on : 1.3, Face : 1
 DEAL::Boundary worker on : 1.3, Face : 3
+DEAL::copier
 DEAL::Cell worker on : 2.0
 DEAL::Boundary worker on : 2.0, Face : 0
 DEAL::Boundary worker on : 2.0, Face : 2
+DEAL::copier
 DEAL::Cell worker on : 2.1
 DEAL::Boundary worker on : 2.1, Face : 2
+DEAL::copier
 DEAL::Cell worker on : 2.2
 DEAL::Boundary worker on : 2.2, Face : 0
-DEAL::Cell worker on : 2.3
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
 DEAL::copier
+DEAL::Cell worker on : 2.3
 DEAL::copier
 DEAL::ONLY FACES ONCE
 DEAL::
 DEAL::Face worker on : 1.1, Neighbor cell : 1.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 1.2, Neighbor cell : 1.3, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
+DEAL::copier
 DEAL::Face worker on : 2.0, Neighbor cell : 2.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.0, Neighbor cell : 2.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.1, Neighbor cell : 1.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 0
 DEAL::Face worker on : 2.1, Neighbor cell : 2.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.2, Neighbor cell : 2.3, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.2, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 0
+DEAL::copier
 DEAL::Face worker on : 2.3, Neighbor cell : 1.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 1
 DEAL::Face worker on : 2.3, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 1
 DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
 DEAL::ONLY FACES BOTH
 DEAL::
 DEAL::Face worker on : 1.1, Neighbor cell : 1.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 1.2, Neighbor cell : 1.3, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 1.3, Neighbor cell : 1.2, Face : 0, Neighbor Face : 1, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 1.3, Neighbor cell : 1.1, Face : 2, Neighbor Face : 3, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.0, Neighbor cell : 2.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.0, Neighbor cell : 2.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.1, Neighbor cell : 2.0, Face : 0, Neighbor Face : 1, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.1, Neighbor cell : 1.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 0
 DEAL::Face worker on : 1.1, Neighbor cell : 2.1, Face : 0, Neighbor Face : 1, Subface: 0, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.1, Neighbor cell : 2.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.2, Neighbor cell : 2.3, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.2, Neighbor cell : 2.0, Face : 2, Neighbor Face : 3, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.2, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 0
 DEAL::Face worker on : 1.2, Neighbor cell : 2.2, Face : 2, Neighbor Face : 3, Subface: 0, Neighbor Subface: 4294967295
+DEAL::copier
 DEAL::Face worker on : 2.3, Neighbor cell : 2.2, Face : 0, Neighbor Face : 1, Subface: 4294967295, Neighbor Subface: 4294967295
 DEAL::Face worker on : 2.3, Neighbor cell : 1.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 1
 DEAL::Face worker on : 1.1, Neighbor cell : 2.3, Face : 0, Neighbor Face : 1, Subface: 1, Neighbor Subface: 4294967295
@@ -128,9 +134,3 @@ DEAL::Face worker on : 2.3, Neighbor cell : 2.1, Face : 2, Neighbor Face : 3, Su
 DEAL::Face worker on : 2.3, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 1
 DEAL::Face worker on : 1.2, Neighbor cell : 2.3, Face : 2, Neighbor Face : 3, Subface: 1, Neighbor Subface: 4294967295
 DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier
-DEAL::copier

diff --git a/tests/meshworker/mesh_loop_03.cc b/tests/meshworker/mesh_loop_03.cc
index 9976aa79597ab1703f4e7ffe15fa8a3eaf8cf0a2..f4d91d8874bfcfdb5215bd259869b48188715da6 100644 (file)
--- a/tests/meshworker/mesh_loop_03.cc
+++ b/tests/meshworker/mesh_loop_03.cc
@@ -93,6 +93,7 @@ void test()
 int main()
 {
   initlog();
+  MultithreadInfo::set_thread_limit(1); // to make output deterministic
 
   test<2,2>();
 }

diff --git a/tests/meshworker/mesh_loop_03.output b/tests/meshworker/mesh_loop_03.output
index 0d6bc50211ad0c25a12a3c4f0e3769be6395353f..146f50274f1bacf7bfb0570ab14624482cd8c1ac 100644 (file)
--- a/tests/meshworker/mesh_loop_03.output
+++ b/tests/meshworker/mesh_loop_03.output
@@ -2,32 +2,32 @@
 DEAL::CELLS ONLY
 DEAL::
 DEAL::Cell worker on : 1.1
-DEAL::Cell worker on : 1.2
-DEAL::Cell worker on : 1.3
-DEAL::Cell worker on : 2.0
-DEAL::Cell worker on : 2.1
-DEAL::Cell worker on : 2.2
-DEAL::Cell worker on : 2.3
 DEAL::copier
+DEAL::Cell worker on : 1.2
 DEAL::copier
+DEAL::Cell worker on : 1.3
 DEAL::copier
+DEAL::Cell worker on : 2.0
 DEAL::copier
+DEAL::Cell worker on : 2.1
 DEAL::copier
+DEAL::Cell worker on : 2.2
 DEAL::copier
+DEAL::Cell worker on : 2.3
 DEAL::copier
 DEAL::CELLS ONLY WORKSTREAM
 DEAL::
 DEAL::Cell worker on : 1.1
-DEAL::Cell worker on : 1.2
-DEAL::Cell worker on : 1.3
-DEAL::Cell worker on : 2.0
-DEAL::Cell worker on : 2.1
-DEAL::Cell worker on : 2.2
-DEAL::Cell worker on : 2.3
 DEAL::copier
+DEAL::Cell worker on : 1.2
 DEAL::copier
+DEAL::Cell worker on : 1.3
 DEAL::copier
+DEAL::Cell worker on : 2.0
 DEAL::copier
+DEAL::Cell worker on : 2.1
 DEAL::copier
+DEAL::Cell worker on : 2.2
 DEAL::copier
+DEAL::Cell worker on : 2.3
 DEAL::copier