Update distorted_cells tests.

diff --git a/tests/bits/distorted_cells_01.cc b/tests/bits/distorted_cells_01.cc
index 953d4dadb64d16f29d2590fa7be9dbcafd210bac..28833dcb1ee6bd97559c2c63e3b8ab25c72bb692 100644 (file)
--- a/tests/bits/distorted_cells_01.cc
+++ b/tests/bits/distorted_cells_01.cc
@@ -83,6 +83,11 @@ check(const unsigned int testcase)
       Assert(dcv.distorted_cells.front() == coarse_grid.begin(0),
              ExcInternalError());
     }
+  catch (ExceptionBase &exc)
+    {
+      deallog << exc.get_exc_name() << std::endl;
+      flag = true;
+    }
 
   Assert(flag == true, ExcInternalError());
 }

diff --git a/tests/bits/distorted_cells_01.debug.output b/tests/bits/distorted_cells_01.debug.output
index c9864839e9152894cf5eac59f8777797fd1716ac..561bb9a823fa7242057e9049efd3bbf10d50fef2 100644 (file)
--- a/tests/bits/distorted_cells_01.debug.output
+++ b/tests/bits/distorted_cells_01.debug.output
@@ -1,13 +1,13 @@
 
 DEAL::Pinched cell in 1d
-DEAL::1 distorted cells
+DEAL::ExcGridHasInvalidCell(cell_no)
 DEAL::Pinched cell in 2d
 DEAL::1 distorted cells
 DEAL::Pinched cell in 3d
 DEAL::1 distorted cells
 DEAL::Twisted cell in 1d
-DEAL::1 distorted cells
+DEAL::ExcGridHasInvalidCell(cell_no)
 DEAL::Twisted cell in 2d
-DEAL::1 distorted cells
+DEAL::ExcGridHasInvalidCell(cell_no)
 DEAL::Twisted cell in 3d
 DEAL::1 distorted cells

diff --git a/tests/bits/distorted_cells_02.cc b/tests/bits/distorted_cells_02.cc
index 2f905101223db28961700286ac14d16a4d163e60..74700a80f6174801511698f66161e5d927cadc02 100644 (file)
--- a/tests/bits/distorted_cells_02.cc
+++ b/tests/bits/distorted_cells_02.cc
@@ -53,18 +53,13 @@ check()
     {
       gi.read_ucd(in);
     }
-  catch (typename Triangulation<dim>::DistortedCellList &dcv)
+  catch (ExceptionBase &exc)
     {
+      deallog << exc.get_exc_name() << std::endl;
       flag = true;
-
-      deallog << dcv.distorted_cells.size() << " distorted cells" << std::endl;
-      Assert(dcv.distorted_cells.front() == coarse_grid.begin(0),
-             ExcInternalError());
     }
 
   Assert(flag == true, ExcInternalError());
-  Assert(coarse_grid.n_levels() == 1, ExcInternalError());
-  Assert(coarse_grid.n_active_cells() == 1, ExcInternalError());
 }
 
 

diff --git a/tests/bits/distorted_cells_02.debug.output b/tests/bits/distorted_cells_02.debug.output
index 09b3dbd5c531c2171aad47d621254b90fb307d5f..ca25752a09ecc4e0ac602dfde7f7b572a50cffe2 100644 (file)
--- a/tests/bits/distorted_cells_02.debug.output
+++ b/tests/bits/distorted_cells_02.debug.output
@@ -1,3 +1,3 @@
 
-DEAL::1 distorted cells
-DEAL::1 distorted cells
+DEAL::ExcGridHasInvalidCell(cell_no)
+DEAL::ExcGridHasInvalidCell(cell_no)

diff --git a/tests/bits/distorted_cells_07.cc b/tests/bits/distorted_cells_07.cc
index 34150657a1db58612885ec13ec91c8094d17eb49..0b47b7fcfcf76b855fd5847f23d6219400d3ab2b 100644 (file)
--- a/tests/bits/distorted_cells_07.cc
+++ b/tests/bits/distorted_cells_07.cc
@@ -74,23 +74,28 @@ check(const unsigned int testcase)
   catch (typename Triangulation<dim>::DistortedCellList &dcv)
     {
       flag = true;
-    }
-
-  Assert(flag == true, ExcInternalError());
 
-  // now build an FEValues object and compute quadrature points on that cell
-  FE_Nothing<dim> dummy;
-  QGauss<dim>     quadrature(2);
-  FEValues<dim>   fe_values(dummy, quadrature, update_JxW_values);
-  // should throw an assertion
-  try
-    {
-      fe_values.reinit(coarse_grid.begin());
+      // now build an FEValues object and compute quadrature points on that cell
+      FE_Nothing<dim> dummy;
+      QGauss<dim>     quadrature(2);
+      FEValues<dim>   fe_values(dummy, quadrature, update_JxW_values);
+      // should throw an assertion
+      try
+        {
+          fe_values.reinit(coarse_grid.begin());
+        }
+      catch (ExceptionBase &e)
+        {
+          deallog << e.get_exc_name() << std::endl;
+        }
     }
-  catch (ExceptionBase &e)
+  catch (ExceptionBase &exc)
     {
-      deallog << e.get_exc_name() << std::endl;
+      deallog << exc.get_exc_name() << std::endl;
+      flag = true;
     }
+
+  Assert(flag == true, ExcInternalError());
 }
 
 

diff --git a/tests/bits/distorted_cells_07.debug.output b/tests/bits/distorted_cells_07.debug.output
index 79c048a7831e0a491b07478ea14ba0e52b928030..f8403476bd43896cb1208310ce5b48b9a58975b1 100644 (file)
--- a/tests/bits/distorted_cells_07.debug.output
+++ b/tests/bits/distorted_cells_07.debug.output
@@ -1,7 +1,7 @@
 
 DEAL::Twisted cell in 1d
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), det, point))
+DEAL::ExcGridHasInvalidCell(cell_no)
 DEAL::Twisted cell in 2d
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), det, point))
+DEAL::ExcGridHasInvalidCell(cell_no)
 DEAL::Twisted cell in 3d
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), det, point))
+DEAL::(typename Mapping<dim, spacedim>::ExcDistortedMappedCell( cell->center(), det, point))