]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
new exceptions in solvers
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 29 Mar 2001 17:16:36 +0000 (17:16 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 29 Mar 2001 17:16:36 +0000 (17:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@4339 0785d39b-7218-0410-832d-ea1e28bc413d

tests/lac/solver.cc
tests/lac/solver.checked

index 8fab1b00a06729d6d489435f0763277a8a0a7de8..e2c38425e2ab1922f46dd23d2f70df788b8a16eb 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -55,7 +55,7 @@ int main()
   SolverRichardson<> rich(control, mem);
   SolverQMRS<> qmrs(control, mem);
 
-  for (unsigned int size=4; size <= 40; size *= 3)
+  for (unsigned int size=4; size <= 30; size *= 3)
     {
       unsigned int dim = (size-1)*(size-1);
 
@@ -89,35 +89,40 @@ int main()
       res.add(-1.,u);
     
       deallog << "SOR-diff:" << res*res << std::endl;
-      
-      deallog.push("no");
-
-      check_method(cg,A,u,f,prec_no);
-      check_method(bicgstab,A,u,f,prec_no);
-      check_method(gmres,A,u,f,prec_no);
-      check_method(qmrs,A,u,f,prec_no);
-
-      deallog.pop();
-      
-      deallog.push("ssor");
-
-      check_method(rich,A,u,f,prec_ssor);
-      check_method(cg,A,u,f,prec_ssor);
-      check_method(bicgstab,A,u,f,prec_ssor);
-      check_method(gmres,A,u,f,prec_ssor);
-      check_method(qmrs,A,u,f,prec_ssor);
-
-      deallog.pop();
-
-      deallog.push("sor");
-
-      check_method(rich,A,u,f,prec_sor);
-      check_method(cg,A,u,f,prec_sor);
-      check_method(bicgstab,A,u,f,prec_sor);
-      check_method(gmres,A,u,f,prec_sor);
-      check_method(qmrs,A,u,f,prec_sor);
 
-      deallog.pop();
+      try
+       {
+         deallog.push("no");
+         
+         check_method(cg,A,u,f,prec_no);
+         check_method(bicgstab,A,u,f,prec_no);
+         check_method(gmres,A,u,f,prec_no);
+         check_method(qmrs,A,u,f,prec_no);
+         
+         deallog.pop();
+         
+         deallog.push("ssor");
+         
+         check_method(rich,A,u,f,prec_ssor);
+         check_method(cg,A,u,f,prec_ssor);
+         check_method(bicgstab,A,u,f,prec_ssor);
+         check_method(gmres,A,u,f,prec_ssor);
+         check_method(qmrs,A,u,f,prec_ssor);
+         
+         deallog.pop();
+         
+         deallog.push("sor");
+         
+         check_method(rich,A,u,f,prec_sor);
+         check_method(bicgstab,A,u,f,prec_sor);
+         check_method(gmres,A,u,f,prec_sor);
+         
+         deallog.pop();
+       }
+      catch (exception& e)
+       {
+         cerr << e.what() << endl;
+       }
     };
 };
 
index f4a57cd01d3b52f7b12bfad12778a25dbaed005c..569089bd3c91b9bb84474343010ab1e8908d4e4b 100644 (file)
@@ -21,14 +21,10 @@ DEAL:ssor:QMRS::Starting
 DEAL:ssor:QMRS::Convergence step 4 
 DEAL:sor:Richardson::Starting 
 DEAL:sor:Richardson::Convergence step 7 
-DEAL:sor:cg::Starting 
-DEAL:sor:cg::Failure step 100 
 DEAL:sor:Bicgstab::Starting 
 DEAL:sor:Bicgstab::Convergence step 5 
 DEAL:sor:GMRES::Starting 
 DEAL:sor:GMRES::Convergence step 5 
-DEAL:sor:QMRS::Starting 
-DEAL:sor:QMRS::Failure step 100 
 DEAL::Size 12 Unknowns 121
 DEAL::SOR-diff:0.00
 DEAL:no:cg::Starting 
@@ -51,43 +47,9 @@ DEAL:ssor:QMRS::Starting
 DEAL:ssor:QMRS::Convergence step 9 
 DEAL:sor:Richardson::Starting 
 DEAL:sor:Richardson::Convergence step 88 
-DEAL:sor:cg::Starting 
-DEAL:sor:cg::Failure step 100 
 DEAL:sor:Bicgstab::Starting 
 DEAL:sor:Bicgstab::Convergence step 14 
 DEAL:sor:GMRES::Starting 
 DEAL:sor:GMRES::Convergence step 20 
-DEAL:sor:QMRS::Starting 
-DEAL:sor:QMRS::Failure step 100 
-DEAL::Size 36 Unknowns 1225
-DEAL::SOR-diff:0.00
-DEAL:no:cg::Starting 
-DEAL:no:cg::Convergence step 49 
-DEAL:no:Bicgstab::Starting 
-DEAL:no:Bicgstab::Convergence step 39 
-DEAL:no:GMRES::Starting 
-DEAL:no:GMRES::Failure step 100 
-DEAL:no:QMRS::Starting 
-DEAL:no:QMRS::Convergence step 53 
-DEAL:ssor:Richardson::Starting 
-DEAL:ssor:Richardson::Failure step 100 
-DEAL:ssor:cg::Starting 
-DEAL:ssor:cg::Convergence step 19 
-DEAL:ssor:Bicgstab::Starting 
-DEAL:ssor:Bicgstab::Convergence step 15 
-DEAL:ssor:GMRES::Starting 
-DEAL:ssor:GMRES::Convergence step 18 
-DEAL:ssor:QMRS::Starting 
-DEAL:ssor:QMRS::Convergence step 21 
-DEAL:sor:Richardson::Starting 
-DEAL:sor:Richardson::Failure step 100 
-DEAL:sor:cg::Starting 
-DEAL:sor:cg::Failure step 100 
-DEAL:sor:Bicgstab::Starting 
-DEAL:sor:Bicgstab::Convergence step 44 
-DEAL:sor:GMRES::Starting 
-DEAL:sor:GMRES::Convergence step 99 
-DEAL:sor:QMRS::Starting 
-DEAL:sor:QMRS::Failure step 100 
-DEAL::GrowingVectorMemory:Overall allocated vectors: 345
+DEAL::GrowingVectorMemory:Overall allocated vectors: 212
 DEAL::GrowingVectorMemory:Maximum allocated vectors: 20

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.