From e39b754cf4508bfd66beda12139556297259184d Mon Sep 17 00:00:00 2001
From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 3 Jan 2014 11:49:35 +0000
Subject: [PATCH] update meshworker tests

git-svn-id: https://svn.dealii.org/trunk@32145 0785d39b-7218-0410-832d-ea1e28bc413d
---
 tests/mpi/mesh_worker_01.cc              |  6 ++-
 tests/mpi/mesh_worker_01.mpirun=1.output | 11 ++----
 tests/mpi/mesh_worker_01.mpirun=2.output | 19 +++-------
 tests/mpi/mesh_worker_02.cc              |  4 --
 tests/mpi/mesh_worker_02.mpirun=1.output | 37 -------------------
 tests/mpi/mesh_worker_02.mpirun=2.output | 47 ++++++------------------
 6 files changed, 26 insertions(+), 98 deletions(-)

diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc
index c0c48b34ce..b9ba6e898f 100644
--- a/tests/mpi/mesh_worker_01.cc
+++ b/tests/mpi/mesh_worker_01.cc
@@ -196,11 +196,15 @@ test()
   lctrl.faces_to_ghost = MeshWorker::LoopControl::never;
   test_loop(dofs, lctrl);
 
+  lctrl.own_faces = MeshWorker::LoopControl::both;
+  lctrl.faces_to_ghost = MeshWorker::LoopControl::never;
+  test_loop(dofs, lctrl);
+
   lctrl.own_faces = MeshWorker::LoopControl::never;
   lctrl.faces_to_ghost = MeshWorker::LoopControl::one;
   test_loop(dofs, lctrl);
 
-  lctrl.own_faces = MeshWorker::LoopControl::one;
+  lctrl.own_faces = MeshWorker::LoopControl::never;
   lctrl.faces_to_ghost = MeshWorker::LoopControl::both;
   test_loop(dofs, lctrl);
 
diff --git a/tests/mpi/mesh_worker_01.mpirun=1.output b/tests/mpi/mesh_worker_01.mpirun=1.output
index 3942256fe5..7d023d8da0 100644
--- a/tests/mpi/mesh_worker_01.mpirun=1.output
+++ b/tests/mpi/mesh_worker_01.mpirun=1.output
@@ -2,21 +2,18 @@
 DEAL:0::DoFHandler ndofs=2
 DEAL:0::*** 1. CELLS ***
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=0
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::* own_cells=1 ghost_cells=0 own_faces=0 faces_to_ghost=0
 DEAL:0::C 0_0:
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::C 1_0:
 DEAL:0::* own_cells=0 ghost_cells=1 own_faces=0 faces_to_ghost=0
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::* own_cells=1 ghost_cells=1 own_faces=0 faces_to_ghost=0
 DEAL:0::C 0_0:
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::C 1_0:
 DEAL:0::*** 2. FACES ***
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=0
 DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
-DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
-DEAL:0::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=2
+DEAL:0::* own_cells=0 ghost_cells=0 own_faces=2 faces_to_ghost=0
 DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
+DEAL:0::F cell1 = 1_0: face = 0 cell2 = 0_0: face2 = 1
+DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
+DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
diff --git a/tests/mpi/mesh_worker_01.mpirun=2.output b/tests/mpi/mesh_worker_01.mpirun=2.output
index 1c0d2db422..5b9577fa81 100644
--- a/tests/mpi/mesh_worker_01.mpirun=2.output
+++ b/tests/mpi/mesh_worker_01.mpirun=2.output
@@ -2,44 +2,35 @@
 DEAL:0::DoFHandler ndofs=2
 DEAL:0::*** 1. CELLS ***
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=0
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::* own_cells=1 ghost_cells=0 own_faces=0 faces_to_ghost=0
 DEAL:0::C 0_0:
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::* own_cells=0 ghost_cells=1 own_faces=0 faces_to_ghost=0
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::C 1_0:
 DEAL:0::* own_cells=1 ghost_cells=1 own_faces=0 faces_to_ghost=0
 DEAL:0::C 0_0:
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:0::C 1_0:
 DEAL:0::*** 2. FACES ***
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=0
-DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
+DEAL:0::* own_cells=0 ghost_cells=0 own_faces=2 faces_to_ghost=0
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
 DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
-DEAL:0::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=2
+DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
 DEAL:0::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 
 DEAL:1::DoFHandler ndofs=2
 DEAL:1::*** 1. CELLS ***
 DEAL:1::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=0
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:1::* own_cells=1 ghost_cells=0 own_faces=0 faces_to_ghost=0
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:1::C 1_0:
 DEAL:1::* own_cells=0 ghost_cells=1 own_faces=0 faces_to_ghost=0
 DEAL:1::C 0_0:
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:1::* own_cells=1 ghost_cells=1 own_faces=0 faces_to_ghost=0
 DEAL:1::C 0_0:
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
 DEAL:1::C 1_0:
 DEAL:1::*** 2. FACES ***
 DEAL:1::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=0
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
+DEAL:1::* own_cells=0 ghost_cells=0 own_faces=2 faces_to_ghost=0
 DEAL:1::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
-DEAL:1::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=2
-DEAL:1::F cell1 = 0_0: face = 1 cell2 = 1_0: face2 = 0
+DEAL:1::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
+DEAL:1::F cell1 = 1_0: face = 0 cell2 = 0_0: face2 = 1
 
diff --git a/tests/mpi/mesh_worker_02.cc b/tests/mpi/mesh_worker_02.cc
index 1f8ce5a49e..6f7b8e063d 100644
--- a/tests/mpi/mesh_worker_02.cc
+++ b/tests/mpi/mesh_worker_02.cc
@@ -178,10 +178,6 @@ test()
   lctrl.faces_to_ghost = MeshWorker::LoopControl::never;
   test_loop(dofs, lctrl);
 
-  lctrl.own_faces = MeshWorker::LoopControl::both;
-  lctrl.faces_to_ghost = MeshWorker::LoopControl::never;
-  test_loop(dofs, lctrl);
-
   lctrl.own_faces = MeshWorker::LoopControl::never;
   lctrl.faces_to_ghost = MeshWorker::LoopControl::one;
   test_loop(dofs, lctrl);
diff --git a/tests/mpi/mesh_worker_02.mpirun=1.output b/tests/mpi/mesh_worker_02.mpirun=1.output
index bf38bda8b7..60594004e9 100644
--- a/tests/mpi/mesh_worker_02.mpirun=1.output
+++ b/tests/mpi/mesh_worker_02.mpirun=1.output
@@ -11,42 +11,5 @@ DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
 DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
 DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::* own_cells=0 ghost_cells=0 own_faces=2 faces_to_ghost=0
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_1:3 face = 0 cell2 = 0_1:2 face2 = 1
-DEAL:0::F cell1 = 0_1:3 face = 2 cell2 = 0_1:1 face2 = 3
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
-DEAL:0::F cell1 = 0_2:01 face = 0 cell2 = 0_2:00 face2 = 1
-DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
-DEAL:0::F cell1 = 0_2:02 face = 2 cell2 = 0_2:00 face2 = 3
-DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::F cell1 = 0_2:03 face = 0 cell2 = 0_2:02 face2 = 1
-DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:03 face = 2 cell2 = 0_2:01 face2 = 3
-DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
-DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
-DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
-DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
-DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
diff --git a/tests/mpi/mesh_worker_02.mpirun=2.output b/tests/mpi/mesh_worker_02.mpirun=2.output
index bf38bda8b7..28eff5ad32 100644
--- a/tests/mpi/mesh_worker_02.mpirun=2.output
+++ b/tests/mpi/mesh_worker_02.mpirun=2.output
@@ -1,52 +1,29 @@
 
 DEAL:0::DoFHandler ndofs=7
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=0
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
 DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
 DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
-DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
 DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
 DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
-DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::* own_cells=0 ghost_cells=0 own_faces=2 faces_to_ghost=0
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_1:3 face = 0 cell2 = 0_1:2 face2 = 1
-DEAL:0::F cell1 = 0_1:3 face = 2 cell2 = 0_1:1 face2 = 3
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
-DEAL:0::F cell1 = 0_2:01 face = 0 cell2 = 0_2:00 face2 = 1
-DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
-DEAL:0::F cell1 = 0_2:02 face = 2 cell2 = 0_2:00 face2 = 3
-DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
-DEAL:0::F cell1 = 0_2:03 face = 0 cell2 = 0_2:02 face2 = 1
-DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:03 face = 2 cell2 = 0_2:01 face2 = 3
-DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
 DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
 DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
 DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
-DEAL:0::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
-DEAL:0::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 1 cell2 = 0_2:01 face2 = 0
-DEAL:0::F cell1 = 0_2:00 face = 3 cell2 = 0_2:02 face2 = 2
 DEAL:0::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
-DEAL:0::F cell1 = 0_2:01 face = 3 cell2 = 0_2:03 face2 = 2
-DEAL:0::F cell1 = 0_2:02 face = 1 cell2 = 0_2:03 face2 = 0
 DEAL:0::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
 DEAL:0::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
 DEAL:0::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
+
+DEAL:1::DoFHandler ndofs=7
+DEAL:1::* own_cells=0 ghost_cells=0 own_faces=1 faces_to_ghost=0
+DEAL:1::F cell1 = 0_1:1 face = 3 cell2 = 0_1:3 face2 = 2
+DEAL:1::F cell1 = 0_1:2 face = 1 cell2 = 0_1:3 face2 = 0
+DEAL:1::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=1
+DEAL:1::* own_cells=0 ghost_cells=0 own_faces=0 faces_to_ghost=2
+DEAL:1::F cell1 = 0_2:01 face = 1 cell2 = 0_1:1 face2 = 0
+DEAL:1::F cell1 = 0_2:02 face = 3 cell2 = 0_1:2 face2 = 2
+DEAL:1::F cell1 = 0_2:03 face = 1 cell2 = 0_1:1 face2 = 0
+DEAL:1::F cell1 = 0_2:03 face = 3 cell2 = 0_1:2 face2 = 2
+
-- 
2.39.5