From 4fa6d0d864bf42604a67b4630945ec4cb1aaec86 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 13 Aug 2017 18:49:49 -0400 Subject: [PATCH] fix tests/meshworker/mesh_loop_ --- tests/meshworker/mesh_loop_02.cc | 1 + tests/meshworker/mesh_loop_02.output | 70 ++++++++++++++-------------- tests/meshworker/mesh_loop_03.cc | 1 + tests/meshworker/mesh_loop_03.output | 24 +++++----- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/tests/meshworker/mesh_loop_02.cc b/tests/meshworker/mesh_loop_02.cc index 9846217ed7..ee37afd9a1 100644 --- 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 0bc6997891..c3da07acc8 100644 --- 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 9976aa7959..f4d91d8874 100644 --- 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 0d6bc50211..146f50274f 100644 --- 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 -- 2.39.5