fix test output

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

diff --git a/tests/mpi/mg_04/ncpu_1/cmp/generic b/tests/mpi/mg_04/ncpu_1/cmp/generic
index 9140b597a708ebdc34606bcd89a3f8c130a76008..dff3dea2c5fd9c7a0f2bd5dcee48c09acba0084b 100644 (file)
--- a/tests/mpi/mg_04/ncpu_1/cmp/generic
+++ b/tests/mpi/mg_04/ncpu_1/cmp/generic
@@ -1,8 +1,8 @@
 
 DEAL:0:2d::hyper_cube
 **** proc 0
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: 0  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 10  | 11  | 12  | 13  | 14  | 15  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 4 9 5 10  | 9 11 10 12  | 5 10 8 13  | 10 12 13 14  | 6 7 15 16  | 7 8 16 17  | 15 16 18 19  | 16 17 19 20  | 8 13 17 21  | 13 14 21 22  | 17 21 20 23  | 21 22 23 24  | 
 
 DEAL:0:2d::OK

diff --git a/tests/mpi/mg_04/ncpu_10/cmp/generic b/tests/mpi/mg_04/ncpu_10/cmp/generic
index a3c35cc5e861cf8be2e6bb3afdaba50408ca0022..65310ee0ac6ff8c0ef571edf46f7d6e35b30d75a 100644 (file)
--- a/tests/mpi/mg_04/ncpu_10/cmp/generic
+++ b/tests/mpi/mg_04/ncpu_10/cmp/generic
@@ -1,41 +1,41 @@
 
 DEAL:0:2d::hyper_cube
 **** proc 0
-level 0: -  | 
+level 0: - - - -  | 
 
 **** proc 1
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: 0  | 1  | 2  | 3  | 4  | -  | 6  | -  | 8  | 9  | -  | -  | 12  | -  | -  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 4 9 5 10  | 9 - 10 -  | 5 10 8 13  | 10 - 13 -  | 6 7 15 16  | 7 8 16 17  | 15 16 - -  | 16 17 - -  | 8 13 17 21  | 13 - 21 -  | 17 21 - -  | 21 - - -  | 
 
 **** proc 2
-level 0: -  | 
+level 0: - - - -  | 
 
 **** proc 3
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | 1  | -  | 3  | 4  | 5  | 6  | 7  | -  | 9  | -  | -  | 12  | 13  | -  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - 1 - 3  | 1 4 3 5  | - 3 - 7  | 3 5 7 8  | 4 9 5 10  | 9 11 10 12  | 5 10 8 13  | 10 12 13 14  | - 7 - 16  | 7 8 16 17  | - 16 - -  | 16 17 - -  | 8 13 17 21  | 13 14 21 22  | 17 21 - -  | 21 22 - -  | 
 
 **** proc 4
-level 0: -  | 
+level 0: - - - -  | 
 
 **** proc 5
-level 0: -  | 
+level 0: - - - -  | 
 
 **** proc 6
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | 2  | 3  | -  | -  | 6  | -  | 8  | 9  | 10  | 11  | 12  | -  | 14  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - - 2 3  | - - 3 5  | 2 3 6 7  | 3 5 7 8  | - - 5 10  | - - 10 -  | 5 10 8 13  | 10 - 13 -  | 6 7 15 16  | 7 8 16 17  | 15 16 18 19  | 16 17 19 20  | 8 13 17 21  | 13 - 21 -  | 17 21 20 23  | 21 - 23 -  | 
 
 **** proc 7
-level 0: -  | 
+level 0: - - - -  | 
 
 **** proc 8
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | -  | 3  | -  | -  | 6  | 7  | -  | 9  | -  | 11  | 12  | 13  | 14  | 15  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - - - 3  | - - 3 5  | - 3 - 7  | 3 5 7 8  | - - 5 10  | - - 10 12  | 5 10 8 13  | 10 12 13 14  | - 7 - 16  | 7 8 16 17  | - 16 - 19  | 16 17 19 20  | 8 13 17 21  | 13 14 21 22  | 17 21 20 23  | 21 22 23 24  | 
 
 **** proc 9
-level 0: -  | 
+level 0: - - - -  | 
 
 DEAL:0:2d::OK

diff --git a/tests/mpi/mg_04/ncpu_2/cmp/generic b/tests/mpi/mg_04/ncpu_2/cmp/generic
index d5488172aa5414e183bdbfb903c669d44e6a4bdd..0a675891315bbf55b59e867e90b2f496d3c4f3e1 100644 (file)
--- a/tests/mpi/mg_04/ncpu_2/cmp/generic
+++ b/tests/mpi/mg_04/ncpu_2/cmp/generic
@@ -1,23 +1,13 @@
 
 DEAL:0:2d::hyper_cube
 **** proc 0
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: 0  | 1  | 2  | 3  | 4  | -  | 6  | -  | 8  | 9  | -  | -  | 12  | -  | -  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 4 9 5 10  | 9 11 10 12  | 5 10 8 13  | 10 12 13 14  | 6 7 15 16  | 7 8 16 17  | 15 16 - -  | 16 17 - -  | 8 13 17 21  | 13 14 21 22  | 17 21 - -  | 21 22 - -  | 
 
 **** proc 1
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | 1  | -  | 3  | 4  | 5  | 6  | 7  | -  | 9  | -  | -  | 12  | 13  | -  | -  | 
-
-**** proc 2
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | 2  | 3  | -  | -  | 6  | -  | 8  | 9  | 10  | 11  | 12  | -  | 14  | -  | 
-
-**** proc 3
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | -  | 3  | -  | -  | 6  | 7  | -  | 9  | -  | 11  | 12  | 13  | 14  | 15  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - - 2 3  | - - 3 5  | 2 3 6 7  | 3 5 7 8  | - - 5 10  | - - 10 12  | 5 10 8 13  | 10 12 13 14  | 6 7 15 16  | 7 8 16 17  | 15 16 18 19  | 16 17 19 20  | 8 13 17 21  | 13 14 21 22  | 17 21 20 23  | 21 22 23 24  | 
 
 DEAL:0:2d::OK

diff --git a/tests/mpi/mg_04/ncpu_4/cmp/generic b/tests/mpi/mg_04/ncpu_4/cmp/generic
index d5488172aa5414e183bdbfb903c669d44e6a4bdd..70c4304325c61caf7a680c1b27374748bf11b3ac 100644 (file)
--- a/tests/mpi/mg_04/ncpu_4/cmp/generic
+++ b/tests/mpi/mg_04/ncpu_4/cmp/generic
@@ -1,23 +1,23 @@
 
 DEAL:0:2d::hyper_cube
 **** proc 0
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: 0  | 1  | 2  | 3  | 4  | -  | 6  | -  | 8  | 9  | -  | -  | 12  | -  | -  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 4 9 5 10  | 9 - 10 -  | 5 10 8 13  | 10 - 13 -  | 6 7 15 16  | 7 8 16 17  | 15 16 - -  | 16 17 - -  | 8 13 17 21  | 13 - 21 -  | 17 21 - -  | 21 - - -  | 
 
 **** proc 1
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | 1  | -  | 3  | 4  | 5  | 6  | 7  | -  | 9  | -  | -  | 12  | 13  | -  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - 1 - 3  | 1 4 3 5  | - 3 - 7  | 3 5 7 8  | 4 9 5 10  | 9 11 10 12  | 5 10 8 13  | 10 12 13 14  | - 7 - 16  | 7 8 16 17  | - 16 - -  | 16 17 - -  | 8 13 17 21  | 13 14 21 22  | 17 21 - -  | 21 22 - -  | 
 
 **** proc 2
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | 2  | 3  | -  | -  | 6  | -  | 8  | 9  | 10  | 11  | 12  | -  | 14  | -  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - - 2 3  | - - 3 5  | 2 3 6 7  | 3 5 7 8  | - - 5 10  | - - 10 -  | 5 10 8 13  | 10 - 13 -  | 6 7 15 16  | 7 8 16 17  | 15 16 18 19  | 16 17 19 20  | 8 13 17 21  | 13 - 21 -  | 17 21 20 23  | 21 - 23 -  | 
 
 **** proc 3
-level 0: 0  | 
-level 1: 0  | 1  | 2  | 3  | 
-level 2: -  | -  | -  | 3  | -  | -  | 6  | 7  | -  | 9  | -  | 11  | 12  | 13  | 14  | 15  | 
+level 0: 0 1 2 3  | 
+level 1: 0 1 2 3  | 1 4 3 5  | 2 3 6 7  | 3 5 7 8  | 
+level 2: - - - 3  | - - 3 5  | - 3 - 7  | 3 5 7 8  | - - 5 10  | - - 10 12  | 5 10 8 13  | 10 12 13 14  | - 7 - 16  | 7 8 16 17  | - 16 - 19  | 16 17 19 20  | 8 13 17 21  | 13 14 21 22  | 17 21 20 23  | 21 22 23 24  | 
 
 DEAL:0:2d::OK