unpreconditioned cg removed from mg.cc

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

diff --git a/tests/deal.II/mg.cc b/tests/deal.II/mg.cc
index d96e98ac10a1f4807f8df50a1d0687f6dcbbbf67..84cfb6f38e7faf18faec73807509f61c183e9bfc 100644 (file)
--- a/tests/deal.II/mg.cc
+++ b/tests/deal.II/mg.cc
@@ -123,9 +123,6 @@ int main()
          SolverControl control(100, 1.e-12);
          SolverCG<>    solver(control, mem);
          
-         PreconditionIdentity precondition;
-         solver.solve(A,u,f,precondition);
-         
          u = 0.;
          MGLevelObject<SparsityPattern> mgstruct(0, tr.n_levels()-1);
          MGLevelObject<SparseMatrix<double> > mgA(0,tr.n_levels()-1);

diff --git a/tests/deal.II/mg.checked b/tests/deal.II/mg.checked
index 8b22120a02887a3edb11276e20f38051fc314bc8..43091d5a02213ac86875c6a0937f688e3565be02 100644 (file)
--- a/tests/deal.II/mg.checked
+++ b/tests/deal.II/mg.checked
@@ -2,72 +2,36 @@
 DEAL:Q1::DoFs 9
 DEAL:Q1::Levels: 2
 DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 2 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 3 
+DEAL:Q1:cg::Convergence step 4 
 DEAL:Q1::DoFs 25
 DEAL:Q1::Levels: 3
 DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 5 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 6 
+DEAL:Q1:cg::Convergence step 7 
 DEAL:Q1::DoFs 81
 DEAL:Q1::Levels: 4
 DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 14 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Starting 
-DEAL:Q1:cg::Convergence step 8 
+DEAL:Q1:cg::Convergence step 9 
 DEAL:Q2::DoFs 25
 DEAL:Q2::Levels: 2
 DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
 DEAL:Q2:cg::Convergence step 6 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Convergence step 5 
 DEAL:Q2::DoFs 81
 DEAL:Q2::Levels: 3
 DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Convergence step 15 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Convergence step 9 
+DEAL:Q2:cg::Convergence step 10 
 DEAL:Q2::DoFs 289
 DEAL:Q2::Levels: 4
 DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Convergence step 46 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Starting 
-DEAL:Q2:cg::Convergence step 8 
+DEAL:Q2:cg::Convergence step 9 
 DEAL:Q3::DoFs 49
 DEAL:Q3::Levels: 2
 DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 12 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 6 
+DEAL:Q3:cg::Convergence step 7 
 DEAL:Q3::DoFs 169
 DEAL:Q3::Levels: 3
 DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 33 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 9 
+DEAL:Q3:cg::Convergence step 10 
 DEAL:Q3::DoFs 625
 DEAL:Q3::Levels: 4
 DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 88 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Starting 
-DEAL:Q3:cg::Convergence step 10 
+DEAL:Q3:cg::Convergence step 11