Minor change to CellWeights exception handling.

diff --git a/source/distributed/cell_weights.cc b/source/distributed/cell_weights.cc
index 8aaefbcd4ee6c841ec5344c8c1295100a186acb7..0688d1db9822068fdf5e1d38b0bd191957f20112 100644 (file)
--- a/source/distributed/cell_weights.cc
+++ b/source/distributed/cell_weights.cc
@@ -171,9 +171,10 @@ namespace parallel
   {
     // Check if we are still working with the correct combination of
     // Triangulation and DoFHandler.
-    AssertThrow(&triangulation == &(dof_handler.get_triangulation()),
-                ExcMessage(
-                  "Triangulation associated with the DoFHandler has changed!"));
+    Assert(&triangulation == &(dof_handler.get_triangulation()),
+           ExcMessage(
+             "Triangulation associated with the DoFHandler has changed!"));
+    (void)triangulation;
 
     // Convert cell type from Triangulation to DoFHandler to be able
     // to access the information about the degrees of freedom.

diff --git a/tests/mpi/hp_cell_weights_01.cc b/tests/mpi/hp_cell_weights_01.cc
index 51809d18b1b88ca2fb293379cefade2d32532b03..0c889c6e53a65971d21f62c6dcc39e493dc35be7 100644 (file)
--- a/tests/mpi/hp_cell_weights_01.cc
+++ b/tests/mpi/hp_cell_weights_01.cc
@@ -105,12 +105,14 @@ test()
     {
       tria.repartition();
     }
-  catch (ExcMessage &)
+  catch (const ExceptionBase &e)
     {
-      deallog << "Triangulation changed" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
     }
 #else
-  deallog << "Triangulation changed" << std::endl;
+  deallog
+    << "ExcMessage(\"Triangulation associated with the DoFHandler has changed!\")"
+    << std::endl;
 #endif
 
   // make sure no processor is hanging
@@ -126,6 +128,8 @@ main(int argc, char *argv[])
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   MPILogInitAll                    log;
 
+  deal_II_exceptions::disable_abort_on_exception();
+
   deallog.push("2d");
   test<2>();
   deallog.pop();

diff --git a/tests/mpi/hp_cell_weights_01.with_p4est=true.mpirun=2.output b/tests/mpi/hp_cell_weights_01.with_p4est=true.mpirun=2.output
index 5f8c76b45b5ddadf6fc089b50e21935ab22f5e13..fd3ed1b81c7a88468b35eeb374900f23857c1edd 100644 (file)
--- a/tests/mpi/hp_cell_weights_01.with_p4est=true.mpirun=2.output
+++ b/tests/mpi/hp_cell_weights_01.with_p4est=true.mpirun=2.output
@@ -3,25 +3,25 @@ DEAL:0:2d::Number of cells before repartitioning: 8
 DEAL:0:2d::  Cumulative dofs per cell: 64
 DEAL:0:2d::Number of cells after repartitioning: 4
 DEAL:0:2d::  Cumulative dofs per cell: 48
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 32
 DEAL:0:3d::  Cumulative dofs per cell: 464
 DEAL:0:3d::Number of cells after repartitioning: 24
 DEAL:0:3d::  Cumulative dofs per cell: 400
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 8
 DEAL:1:2d::  Cumulative dofs per cell: 32
 DEAL:1:2d::Number of cells after repartitioning: 12
 DEAL:1:2d::  Cumulative dofs per cell: 48
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 32
 DEAL:1:3d::  Cumulative dofs per cell: 256
 DEAL:1:3d::Number of cells after repartitioning: 40
 DEAL:1:3d::  Cumulative dofs per cell: 320
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK
 

diff --git a/tests/mpi/hp_cell_weights_02.cc b/tests/mpi/hp_cell_weights_02.cc
index a98c5780a4b1a1698eea61bf6546545657fbcabe..a8fa6042b19b77af501877be1c19973445c48521 100644 (file)
--- a/tests/mpi/hp_cell_weights_02.cc
+++ b/tests/mpi/hp_cell_weights_02.cc
@@ -111,12 +111,14 @@ test()
     {
       tria.repartition();
     }
-  catch (ExcMessage &)
+  catch (const ExceptionBase &e)
     {
-      deallog << "Triangulation changed" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
     }
 #else
-  deallog << "Triangulation changed" << std::endl;
+  deallog
+    << "ExcMessage(\"Triangulation associated with the DoFHandler has changed!\")"
+    << std::endl;
 #endif
 
   // make sure no processor is hanging
@@ -132,6 +134,8 @@ main(int argc, char *argv[])
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   MPILogInitAll                    log;
 
+  deal_II_exceptions::disable_abort_on_exception();
+
   deallog.push("2d");
   test<2>();
   deallog.pop();

diff --git a/tests/mpi/hp_cell_weights_02.with_p4est=true.mpirun=3.output b/tests/mpi/hp_cell_weights_02.with_p4est=true.mpirun=3.output
index c45b65557593891cbd8ff2f84a1c6c1fab39891b..a24069ec0aa9ebe0cb6f332882eeb266fdbd17db 100644 (file)
--- a/tests/mpi/hp_cell_weights_02.with_p4est=true.mpirun=3.output
+++ b/tests/mpi/hp_cell_weights_02.with_p4est=true.mpirun=3.output
@@ -3,26 +3,26 @@ DEAL:0:2d::Number of cells before repartitioning: 20
 DEAL:0:2d::  Cumulative dofs per cell: 140
 DEAL:0:2d::Number of cells after repartitioning: 12
 DEAL:0:2d::  Cumulative dofs per cell: 108
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 168
 DEAL:0:3d::  Cumulative dofs per cell: 1848
 DEAL:0:3d::Number of cells after repartitioning: 128
 DEAL:0:3d::  Cumulative dofs per cell: 1528
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 24
 DEAL:1:2d::  Cumulative dofs per cell: 96
 DEAL:1:2d::Number of cells after repartitioning: 28
 DEAL:1:2d::  Cumulative dofs per cell: 112
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 176
 DEAL:1:3d::  Cumulative dofs per cell: 1408
 DEAL:1:3d::Number of cells after repartitioning: 192
 DEAL:1:3d::  Cumulative dofs per cell: 1536
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK
 
 
@@ -30,12 +30,12 @@ DEAL:2:2d::Number of cells before repartitioning: 20
 DEAL:2:2d::  Cumulative dofs per cell: 80
 DEAL:2:2d::Number of cells after repartitioning: 24
 DEAL:2:2d::  Cumulative dofs per cell: 96
-DEAL:2:2d::Triangulation changed
+DEAL:2:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:2:2d::OK
 DEAL:2:3d::Number of cells before repartitioning: 168
 DEAL:2:3d::  Cumulative dofs per cell: 1344
 DEAL:2:3d::Number of cells after repartitioning: 192
 DEAL:2:3d::  Cumulative dofs per cell: 1536
-DEAL:2:3d::Triangulation changed
+DEAL:2:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:2:3d::OK
 

diff --git a/tests/mpi/hp_cell_weights_03.cc b/tests/mpi/hp_cell_weights_03.cc
index 01d653fee41d5b2c4aad22adabdab9af8f2ab621..71c80778af25166adc6f17074f997c14116ea50e 100644 (file)
--- a/tests/mpi/hp_cell_weights_03.cc
+++ b/tests/mpi/hp_cell_weights_03.cc
@@ -116,12 +116,14 @@ test()
     {
       tria.execute_coarsening_and_refinement();
     }
-  catch (ExcMessage &)
+  catch (const ExceptionBase &e)
     {
-      deallog << "Triangulation changed" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
     }
 #else
-  deallog << "Triangulation changed" << std::endl;
+  deallog
+    << "ExcMessage(\"Triangulation associated with the DoFHandler has changed!\")"
+    << std::endl;
 #endif
 
   // make sure no processor is hanging
@@ -137,6 +139,8 @@ main(int argc, char *argv[])
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   MPILogInitAll                    log;
 
+  deal_II_exceptions::disable_abort_on_exception();
+
   deallog.push("2d");
   test<2>();
   deallog.pop();

diff --git a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output b/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output
index 7f1e8bb661022609e492d5947b0a7eb7e78f3796..cf5a684bf23d7b037b862489f79c3c3afc79c6e3 100644 (file)
--- a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output
+++ b/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output
@@ -3,25 +3,25 @@ DEAL:0:2d::Number of cells before repartitioning: 8
 DEAL:0:2d::  Cumulative dofs per cell: 32
 DEAL:0:2d::Number of cells after repartitioning: 13
 DEAL:0:2d::  Cumulative dofs per cell: 52
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 33
 DEAL:0:3d::  Cumulative dofs per cell: 264
 DEAL:0:3d::Number of cells after repartitioning: 47
 DEAL:0:3d::  Cumulative dofs per cell: 376
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 8
 DEAL:1:2d::  Cumulative dofs per cell: 64
 DEAL:1:2d::Number of cells after repartitioning: 3
 DEAL:1:2d::  Cumulative dofs per cell: 44
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 31
 DEAL:1:3d::  Cumulative dofs per cell: 456
 DEAL:1:3d::Number of cells after repartitioning: 17
 DEAL:1:3d::  Cumulative dofs per cell: 344
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK
 

diff --git a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1 b/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1
index 0f26ba9e6e637bbac0debbeb85d33ff9d5e8fcc7..0f4b5a5ac620be5dad7bb186999d1b2e95292bf5 100644 (file)
--- a/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1
+++ b/tests/mpi/hp_cell_weights_03.with_mpi=true.with_metis=true.mpirun=2.output.1
@@ -3,25 +3,25 @@ DEAL:0:2d::Number of cells before repartitioning: 8
 DEAL:0:2d::  Cumulative dofs per cell: 64
 DEAL:0:2d::Number of cells after repartitioning: 13
 DEAL:0:2d::  Cumulative dofs per cell: 52
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 32
 DEAL:0:3d::  Cumulative dofs per cell: 256
 DEAL:0:3d::Number of cells after repartitioning: 47
 DEAL:0:3d::  Cumulative dofs per cell: 376
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 8
 DEAL:1:2d::  Cumulative dofs per cell: 32
 DEAL:1:2d::Number of cells after repartitioning: 3
 DEAL:1:2d::  Cumulative dofs per cell: 44
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 32
 DEAL:1:3d::  Cumulative dofs per cell: 464
 DEAL:1:3d::Number of cells after repartitioning: 17
 DEAL:1:3d::  Cumulative dofs per cell: 344
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK
 

diff --git a/tests/mpi/hp_cell_weights_04.cc b/tests/mpi/hp_cell_weights_04.cc
index 3cc0afaaf19ce87cef4bbca912b124d9fae2f6e6..f1c67a687e921bfdc4a1739844904a37079392a2 100644 (file)
--- a/tests/mpi/hp_cell_weights_04.cc
+++ b/tests/mpi/hp_cell_weights_04.cc
@@ -118,12 +118,14 @@ test()
     {
       tria.execute_coarsening_and_refinement();
     }
-  catch (ExcMessage &)
+  catch (const ExceptionBase &e)
     {
-      deallog << "Triangulation changed" << std::endl;
+      deallog << e.get_exc_name() << std::endl;
     }
 #else
-  deallog << "Triangulation changed" << std::endl;
+  deallog
+    << "ExcMessage(\"Triangulation associated with the DoFHandler has changed!\")"
+    << std::endl;
 #endif
 
   // make sure no processor is hanging
@@ -139,6 +141,8 @@ main(int argc, char *argv[])
   Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
   MPILogInitAll                    log;
 
+  deal_II_exceptions::disable_abort_on_exception();
+
   deallog.push("2d");
   test<2>();
   deallog.pop();

diff --git a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output b/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output
index 7f1e8bb661022609e492d5947b0a7eb7e78f3796..cf5a684bf23d7b037b862489f79c3c3afc79c6e3 100644 (file)
--- a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output
+++ b/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output
@@ -3,25 +3,25 @@ DEAL:0:2d::Number of cells before repartitioning: 8
 DEAL:0:2d::  Cumulative dofs per cell: 32
 DEAL:0:2d::Number of cells after repartitioning: 13
 DEAL:0:2d::  Cumulative dofs per cell: 52
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 33
 DEAL:0:3d::  Cumulative dofs per cell: 264
 DEAL:0:3d::Number of cells after repartitioning: 47
 DEAL:0:3d::  Cumulative dofs per cell: 376
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 8
 DEAL:1:2d::  Cumulative dofs per cell: 64
 DEAL:1:2d::Number of cells after repartitioning: 3
 DEAL:1:2d::  Cumulative dofs per cell: 44
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 31
 DEAL:1:3d::  Cumulative dofs per cell: 456
 DEAL:1:3d::Number of cells after repartitioning: 17
 DEAL:1:3d::  Cumulative dofs per cell: 344
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK
 

diff --git a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1 b/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1
index 0f26ba9e6e637bbac0debbeb85d33ff9d5e8fcc7..0f4b5a5ac620be5dad7bb186999d1b2e95292bf5 100644 (file)
--- a/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1
+++ b/tests/mpi/hp_cell_weights_04.with_mpi=true.with_metis=true.mpirun=2.output.1
@@ -3,25 +3,25 @@ DEAL:0:2d::Number of cells before repartitioning: 8
 DEAL:0:2d::  Cumulative dofs per cell: 64
 DEAL:0:2d::Number of cells after repartitioning: 13
 DEAL:0:2d::  Cumulative dofs per cell: 52
-DEAL:0:2d::Triangulation changed
+DEAL:0:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:2d::OK
 DEAL:0:3d::Number of cells before repartitioning: 32
 DEAL:0:3d::  Cumulative dofs per cell: 256
 DEAL:0:3d::Number of cells after repartitioning: 47
 DEAL:0:3d::  Cumulative dofs per cell: 376
-DEAL:0:3d::Triangulation changed
+DEAL:0:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:0:3d::OK
 
 DEAL:1:2d::Number of cells before repartitioning: 8
 DEAL:1:2d::  Cumulative dofs per cell: 32
 DEAL:1:2d::Number of cells after repartitioning: 3
 DEAL:1:2d::  Cumulative dofs per cell: 44
-DEAL:1:2d::Triangulation changed
+DEAL:1:2d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:2d::OK
 DEAL:1:3d::Number of cells before repartitioning: 32
 DEAL:1:3d::  Cumulative dofs per cell: 464
 DEAL:1:3d::Number of cells after repartitioning: 17
 DEAL:1:3d::  Cumulative dofs per cell: 344
-DEAL:1:3d::Triangulation changed
+DEAL:1:3d::ExcMessage("Triangulation associated with the DoFHandler has changed!")
 DEAL:1:3d::OK