update test output

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

diff --git a/tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic b/tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic
index 7761fc852b6e0017918bfcdcc252a472a1f56ca6..50384e8b1c7adc1a981b1b373fd3292fb1ced3f1 100644 (file)
--- a/tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic
+++ b/tests/mpi/multigrid_adaptive/ncpu_4/cmp/generic
@@ -1,5 +1,71 @@
 
 DEAL::Cycle 0:
+DEAL::   Number of active cells:       16
+DEAL::Number of degrees of freedom: 25   L0: 4   L1: 9   L2: 25
+DEAL::   Number of degrees of freedom: 25 (by level: 4, 9, 25)
+DEAL:cg::Starting value 0.187500
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::Convergence step 5 value 1.65911e-17
+DEAL::Cycle 1:
 DEAL::   Number of active cells:       64
 DEAL::Number of degrees of freedom: 81   L0: 4   L1: 9   L2: 25   L3: 81
 DEAL::   Number of degrees of freedom: 81 (by level: 4, 9, 25, 81)
@@ -124,11 +190,11 @@ DEAL:cg::V-cycle leaving  level 2
 DEAL:cg::Smoothing on     level 3
 DEAL:cg::V-cycle leaving  level 3
 DEAL:cg::Convergence step 7 value 2.00480e-14
-DEAL::Cycle 1:
-DEAL::   Number of active cells:       256
-DEAL::Number of degrees of freedom: 289   L0: 4   L1: 9   L2: 25   L3: 81   L4: 289
-DEAL::   Number of degrees of freedom: 289 (by level: 4, 9, 25, 81, 289)
-DEAL:cg::Starting value 0.0585938
+DEAL::Cycle 2:
+DEAL::   Number of active cells:       220
+DEAL::Number of degrees of freedom: 257   L0: 4   L1: 9   L2: 25   L3: 81   L4: 249
+DEAL::   Number of degrees of freedom: 257 (by level: 4, 9, 25, 81, 249)
+DEAL:cg::Starting value 0.0638137
 DEAL:cg::V-cycle entering level 4
 DEAL:cg::Smoothing on     level 4
 DEAL:cg::Residual on      level 4
@@ -305,12 +371,88 @@ DEAL:cg::Smoothing on     level 3
 DEAL:cg::V-cycle leaving  level 3
 DEAL:cg::Smoothing on     level 4
 DEAL:cg::V-cycle leaving  level 4
-DEAL:cg::Convergence step 8 value 4.39876e-14
-DEAL::Cycle 2:
-DEAL::   Number of active cells:       1024
-DEAL::Number of degrees of freedom: 1089   L0: 4   L1: 9   L2: 25   L3: 81   L4: 289   L5: 1089
-DEAL::   Number of degrees of freedom: 1089 (by level: 4, 9, 25, 81, 289, 1089)
-DEAL:cg::Starting value 0.0302734
+DEAL:cg::V-cycle entering level 4
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::Residual on      level 4
+DEAL:cg::V-cycle entering level 3
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::Residual on      level 3
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::V-cycle leaving  level 3
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::V-cycle leaving  level 4
+DEAL:cg::Convergence step 9 value 8.34225e-13
+DEAL::Cycle 3:
+DEAL::   Number of active cells:       610
+DEAL::Number of degrees of freedom: 706   L0: 4   L1: 9   L2: 25   L3: 81   L4: 285   L5: 600
+DEAL::   Number of degrees of freedom: 706 (by level: 4, 9, 25, 81, 285, 600)
+DEAL:cg::Starting value 0.0462052
+DEAL:cg::V-cycle entering level 5
+DEAL:cg::Smoothing on     level 5
+DEAL:cg::Residual on      level 5
+DEAL:cg::V-cycle entering level 4
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::Residual on      level 4
+DEAL:cg::V-cycle entering level 3
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::Residual on      level 3
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::V-cycle leaving  level 3
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::V-cycle leaving  level 4
+DEAL:cg::Smoothing on     level 5
+DEAL:cg::V-cycle leaving  level 5
+DEAL:cg::V-cycle entering level 5
+DEAL:cg::Smoothing on     level 5
+DEAL:cg::Residual on      level 5
+DEAL:cg::V-cycle entering level 4
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::Residual on      level 4
+DEAL:cg::V-cycle entering level 3
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::Residual on      level 3
+DEAL:cg::V-cycle entering level 2
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::Residual on      level 2
+DEAL:cg::V-cycle entering level 1
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::Residual on      level 1
+DEAL:cg::V-cycle entering level 0
+DEAL:cg::Coarse level           0
+DEAL:cg::Smoothing on     level 1
+DEAL:cg::V-cycle leaving  level 1
+DEAL:cg::Smoothing on     level 2
+DEAL:cg::V-cycle leaving  level 2
+DEAL:cg::Smoothing on     level 3
+DEAL:cg::V-cycle leaving  level 3
+DEAL:cg::Smoothing on     level 4
+DEAL:cg::V-cycle leaving  level 4
+DEAL:cg::Smoothing on     level 5
+DEAL:cg::V-cycle leaving  level 5
 DEAL:cg::V-cycle entering level 5
 DEAL:cg::Smoothing on     level 5
 DEAL:cg::Residual on      level 5
@@ -554,4 +696,4 @@ DEAL:cg::Smoothing on     level 4
 DEAL:cg::V-cycle leaving  level 4
 DEAL:cg::Smoothing on     level 5
 DEAL:cg::V-cycle leaving  level 5
-DEAL:cg::Convergence step 9 value 6.07087e-14
+DEAL:cg::Convergence step 11 value 2.16358e-13