update meshworker tests

git-svn-id: https://svn.dealii.org/trunk@32145 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/mpi/mesh_worker_01.cc b/tests/mpi/mesh_worker_01.cc
index c0c48b34cef9ad8060fe7ca7ecbe6dad741d6774..b9ba6e898f4cdc3a58b4cfd4097be27df5e436f7 100644 (file)
--- 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 3942256fe5e9c63d25f6cb250cff5192ddf12958..7d023d8da0eb4d1c45b73fc571789ff784243a62 100644 (file)
--- 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 1c0d2db42278227c352b425be472f7428810723d..5b9577fa8173fa6f7ea21d1f277b28a7d107002a 100644 (file)
--- 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 1f8ce5a49ed1eebcb7b70845acb198b5175f381b..6f7b8e063d0636e12e6df9fb2e2fbdf565e69a42 100644 (file)
--- 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 bf38bda8b7b35da471f1efc349d8481634f66b3f..60594004e9e5ef6c0929eebd9c763218b720474c 100644 (file)
--- 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 bf38bda8b7b35da471f1efc349d8481634f66b3f..28eff5ad320f644b48a7c8f063a0e60025e5421a 100644 (file)
--- 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
+