do not use abort.o anymore

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

diff --git a/tests/base/reference.cc b/tests/base/reference.cc
index 7479193b4dc2d2acf78ef5b560841f7c89884f30..a581f97f4443659be5c67ed49d975a62862d0749 100644 (file)
--- a/tests/base/reference.cc
+++ b/tests/base/reference.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -38,6 +38,7 @@ class Test : public Subscriptor
 
 int main()
 {
+  deal_II_exceptions::disable_abort_on_exception();
   std::ofstream logfile("reference/output");
   deallog.attach(logfile);
   deallog.depth_console(0);

diff --git a/tests/base/slice_vector.cc b/tests/base/slice_vector.cc
index 4ffebc26a5e93d956eb5a8dc2462814905074e35..0bd48d878e361b94532d0005c10685a74e2f99e9 100644 (file)
--- a/tests/base/slice_vector.cc
+++ b/tests/base/slice_vector.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 2004, 2005 by the deal.II authors
+//    Copyright (C) 2004, 2005, 2006 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -33,6 +33,7 @@ void f(const std::vector<int>& v)
 
 int main()
 {
+  deal_II_exceptions::disable_abort_on_exception();
   std::ofstream logfile("slice_vector/output");
   deallog.attach(logfile);
   deallog.depth_console(0);

diff --git a/tests/base/slice_vector/cmp/generic b/tests/base/slice_vector/cmp/generic
index b62a429bfa51491765a233c5d46f52ec15526a5e..bb98c4c5022d9241465c06d7171315051d1ab67e 100644 (file)
--- a/tests/base/slice_vector/cmp/generic
+++ b/tests/base/slice_vector/cmp/generic
@@ -11,7 +11,6 @@ The name and call sequence of the exception was:
 Additional Information: 
 Index 5 is not in [0,5[
 --------------------------------------------------------
-DEAL::Abort!!!
 --------------------------------------------------------
 An error occurred in file <vector_slice.h> in function
     typename VECTOR::reference VectorSlice<VECTOR>::operator[](unsigned int) [with VECTOR = std::vector<int, std::allocator<int> >]
@@ -22,4 +21,3 @@ The name and call sequence of the exception was:
 Additional Information: 
 Index 4 is not in [0,4[
 --------------------------------------------------------
-DEAL::Abort!!!

diff --git a/tests/bits/accessor_equality.cc b/tests/bits/accessor_equality.cc
index 48037302620b322df3b57f95209e38b246db1e92..fb28d4e0aac852b7f3924b114b4e5cf5e69ee3cd 100644 (file)
--- a/tests/bits/accessor_equality.cc
+++ b/tests/bits/accessor_equality.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 2005 by the deal.II authors
+//    Copyright (C) 2005, 2006 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -96,6 +96,7 @@ void test ()
 
 int main ()
 {
+  deal_II_exceptions::disable_abort_on_exception();
   std::ofstream logfile("accessor_equality/output");
   deallog.attach(logfile);
   deallog.depth_console(0);

diff --git a/tests/bits/accessor_equality/cmp/generic b/tests/bits/accessor_equality/cmp/generic
index 22fb02e69dea07b6306093c1946f0b1dc4b75cf1..e3bb30c412583d667017f7e6167cc9823d93933c 100644 (file)
--- a/tests/bits/accessor_equality/cmp/generic
+++ b/tests/bits/accessor_equality/cmp/generic
@@ -1,10 +1,7 @@
 
 DEAL::1d
 DEAL::1.0
-DEAL::Abort!!!
 DEAL::2d
 DEAL::1.0
-DEAL::Abort!!!
 DEAL::3d
 DEAL::1.0
-DEAL::Abort!!!

diff --git a/tests/bits/grid_generator_01.cc b/tests/bits/grid_generator_01.cc
index 290da97012d6ea56d0a95c45373614b13428bb22..b541ccc4f44712f32fba26e0e1cefd0b008557c2 100644 (file)
--- a/tests/bits/grid_generator_01.cc
+++ b/tests/bits/grid_generator_01.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 2005 by the deal.II authors
+//    Copyright (C) 2005, 2006 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -99,7 +99,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }
-  if (true)
+  if (dim>1)
     {
       deallog << "enclosed_hyper_cube" << std::endl;
       Triangulation<dim> tr;
@@ -107,7 +107,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }
-  if (true)
+  if (dim>1)
     {
       deallog << "hyper_ball" << std::endl;
       Triangulation<dim> tr;
@@ -115,7 +115,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim>1)
     {
       deallog << "cylinder" << std::endl;
       Triangulation<dim> tr;
@@ -123,7 +123,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim>1)
     {
       deallog << "hyper_L" << std::endl;
       Triangulation<dim> tr;
@@ -131,7 +131,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim==2)
     {
       deallog << "hyper_cube_slit" << std::endl;
       Triangulation<dim> tr;
@@ -139,7 +139,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim==2)
     {
       deallog << "hyper_shell" << std::endl;
       Triangulation<dim> tr;
@@ -147,7 +147,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim>2)
     {
       deallog << "cylinder_shell" << std::endl;
       Triangulation<dim> tr;
@@ -155,7 +155,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim>1)
     {
       deallog << "half_hyper_ball" << std::endl;
       Triangulation<dim> tr;
@@ -163,7 +163,7 @@ void test(std::ostream& out)
       if (tr.n_cells() > 0)
        go.write(tr, out, format);
     }  
-  if (true)
+  if (dim==2)
     {
       deallog << "half_hyper_shell" << std::endl;
       Triangulation<dim> tr;

diff --git a/tests/bits/grid_generator_01/cmp/generic b/tests/bits/grid_generator_01/cmp/generic
index e4f086da48fe92ac6df6c8f71931c00beb761e1f..a49ea63af0dc6ac52599f70f4a4b69256c60872a 100644 (file)
--- a/tests/bits/grid_generator_01/cmp/generic
+++ b/tests/bits/grid_generator_01/cmp/generic
@@ -15,24 +15,6 @@ DEAL:1d::subdivided_hyper_rectangle
 2.00000 0 0
 2.50000 0 0
 
-DEAL:1d::enclosed_hyper_cube
-DEAL:1d::Abort!!!
-DEAL:1d::hyper_ball
-DEAL:1d::Abort!!!
-DEAL:1d::cylinder
-DEAL:1d::Abort!!!
-DEAL:1d::hyper_L
-DEAL:1d::Abort!!!
-DEAL:1d::hyper_cube_slit
-DEAL:1d::Abort!!!
-DEAL:1d::hyper_shell
-DEAL:1d::Abort!!!
-DEAL:1d::cylinder_shell
-DEAL:1d::Abort!!!
-DEAL:1d::half_hyper_ball
-DEAL:1d::Abort!!!
-DEAL:1d::half_hyper_shell
-DEAL:1d::Abort!!!
 DEAL:2d::hyper_cube
 #FIG 3.2
 Landscape
@@ -819,8 +801,6 @@ Single
 2 1 0 3 1 -1 800 0 -1 0.0  0 0 -1 0 0 2
        6834    -3036
        7200    -1200
-DEAL:2d::cylinder_shell
-DEAL:2d::Abort!!!
 DEAL:2d::half_hyper_ball
 #FIG 3.2
 Landscape
@@ -1571,10 +1551,6 @@ component "level" value "level"
 object "grid data" class group
 member "cells" value "cell data"
 end
-DEAL:3d::hyper_cube_slit
-DEAL:3d::Abort!!!
-DEAL:3d::hyper_shell
-DEAL:3d::Abort!!!
 DEAL:3d::cylinder_shell
 object "vertices" class array type float rank 1 shape 3 items 280 data follows
        6.00000 0.00000 0.00000
@@ -2034,5 +2010,3 @@ component "level" value "level"
 object "grid data" class group
 member "cells" value "cell data"
 end
-DEAL:3d::half_hyper_shell
-DEAL:3d::Abort!!!