Use Assert, not AssertThrow, with ExcInternalError.

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index 90285b84f806f4b7d762716ae463041f96db67e1..b4a3d9f03819a5eb864a14c21f9f6e70242e2590 100644 (file)
--- a/include/deal.II/base/symmetric_tensor.h
+++ b/include/deal.II/base/symmetric_tensor.h
@@ -1909,7 +1909,7 @@ namespace internal
                   return dim+c;
 
             // should never get here:
-            AssertThrow(false, ExcInternalError());
+            Assert(false, ExcInternalError());
             return 0;
           }
           }
@@ -2011,7 +2011,7 @@ namespace internal
                   return TableIndices<2>(d,e);
 
             // should never get here:
-            AssertThrow(false, ExcInternalError());
+            Assert(false, ExcInternalError());
             return TableIndices<2>(0, 0);
           }
       }

diff --git a/include/deal.II/lac/swappable_vector.templates.h b/include/deal.II/lac/swappable_vector.templates.h
index de3706ed4e9bb9411aa9e22aefc065a32c85647c..230ef2fa0cd7299dafbb57e9af9cd2e936f20074 100644 (file)
--- a/include/deal.II/lac/swappable_vector.templates.h
+++ b/include/deal.II/lac/swappable_vector.templates.h
@@ -223,7 +223,8 @@ void SwappableVector<number>::kill_file ()
   if (filename != "")
     {
       int status = std::remove (filename.c_str());
-      AssertThrow (status == 0, ExcInternalError());
+      (void)status;
+      Assert (status == 0, ExcInternalError());
 
       filename = "";
     };

diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc
index 24d602b7c4b53e197600fd27133f33d09643cb18..e95e085eaac9611e83e4e41ee4a5056de48ab326 100644 (file)
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@ -138,7 +138,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
       partition();
       this->update_number_cache ();

diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
index 3e175ffdb432b7c04290fe29c032cca85bd1fa6f..4a768825e907fc7efe47f8d302b722e373d99214 100644 (file)
--- a/source/distributed/tria.cc
+++ b/source/distributed/tria.cc
@@ -882,7 +882,7 @@ namespace
             break;
           }
           default:
-            AssertThrow (false, ExcInternalError());
+            Assert (false, ExcInternalError());
           }
       }
   }
@@ -1335,7 +1335,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       // note that now we have some content in the p4est objects and call the
@@ -1355,7 +1355,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       this->update_number_cache ();
@@ -1884,7 +1884,7 @@ namespace parallel
           // triangulation should not
           // be checking for
           // distorted cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       this->update_number_cache ();
@@ -2568,7 +2568,7 @@ namespace parallel
               {
                 // the underlying triangulation should not be checking for
                 // distorted cells
-                AssertThrow (false, ExcInternalError());
+                Assert (false, ExcInternalError());
               }
 
             refinement_in_progress = saved_refinement_in_progress;
@@ -2689,7 +2689,7 @@ namespace parallel
             {
               // the underlying triangulation should not be checking for
               // distorted cells
-              AssertThrow (false, ExcInternalError());
+              Assert (false, ExcInternalError());
             }
 
           refinement_in_progress = saved_refinement_in_progress;
@@ -2986,7 +2986,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
 #ifdef DEBUG
@@ -3102,7 +3102,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       refinement_in_progress = false;
@@ -3657,7 +3657,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       //finally call the base class for storing the periodicity information
@@ -3714,7 +3714,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       // note that now we have some content in the p4est objects and call the
@@ -3755,7 +3755,7 @@ namespace parallel
         {
           // the underlying triangulation should not be checking for distorted
           // cells
-          AssertThrow (false, ExcInternalError());
+          Assert (false, ExcInternalError());
         }
 
       this->update_number_cache ();

diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc
index 40ce9bad4fc172243152a57029df983a84900a8d..b90da05fc6d3e13bef12bcd8edc862b196b61ec7 100644 (file)
--- a/source/dofs/dof_tools_constraints.cc
+++ b/source/dofs/dof_tools_constraints.cc
@@ -1039,7 +1039,7 @@ namespace DoFTools
       const dealii::hp::FECollection<dim,spacedim> *
       get_fe_collection (const dealii::DoFHandler<dim,spacedim> &)
       {
-        AssertThrow(false, ExcInternalError());
+        Assert(false, ExcInternalError());
         return NULL;
       }
     }

diff --git a/source/fe/fe_q_bubbles.cc b/source/fe/fe_q_bubbles.cc
index 164864032ecf2d038f73512d998ac7b0406ee3fa..a3ca46d7d3d43a0b5ae51ffa8894caf260584093 100644 (file)
--- a/source/fe/fe_q_bubbles.cc
+++ b/source/fe/fe_q_bubbles.cc
@@ -74,7 +74,7 @@ namespace FE_Q_Bubbles_Helper
           q_fine.reset(new QGauss<dim> (degree+1));
           break;
         default:
-          AssertThrow(false, ExcInternalError());
+          Assert(false, ExcInternalError());
         }
 
       Assert(q_fine.get() != NULL, ExcInternalError());

diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc
index 6e4b71bbe0cf442e50f52ad30e94340ec16ed529..663bfacb5203abcde06a59be9e203c188dc476b4 100644 (file)
--- a/source/grid/grid_generator.cc
+++ b/source/grid/grid_generator.cc
@@ -329,7 +329,7 @@ namespace GridGenerator
                       cell->face(f)->line(j)->set_boundary_id(1);
               }
             else
-              AssertThrow (false, ExcInternalError());
+              Assert (false, ExcInternalError());
           }
     }
 

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index 2c9e44725bf6567d15efaee2e09ca369993fad07..c435304ada46c94c4a7937cdf483132008695d56 100644 (file)
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -1777,7 +1777,7 @@ void GridIn<2>::read_netcdf (const std::string &filename)
   vertex_indices_var->get(&*vertex_indices.begin(), n_bquads, vertices_per_quad);
 
   for (unsigned int i=0; i<vertex_indices.size(); ++i)
-    AssertThrow(vertex_indices[i]>=0, ExcInternalError());
+    Assert(vertex_indices[i]>=0, ExcInternalError());
 
   if (output)
     {
@@ -1948,7 +1948,7 @@ void GridIn<3>::read_netcdf (const std::string &filename)
   vertex_indices_var->get(&*vertex_indices.begin(), n_cells, vertices_per_hex);
 
   for (unsigned int i=0; i<vertex_indices.size(); ++i)
-    AssertThrow(vertex_indices[i]>=0, ExcInternalError());
+    Assert(vertex_indices[i]>=0, ExcInternalError());
 
   if (output)
     {

diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 0720ae3360e5e8d71106447f879d13f534201f2d..6c0467c0c57a169819d55fd551cd93b0565d8d29 100644 (file)
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -3530,7 +3530,7 @@ next_cell:
       if (matching == m_tff) return 1;           // [true ,false,false]
       static const MATCH_T m_ttf = {{ 1 , 0 }};
       if (matching == m_ttf) return 3;           // [true ,true ,false]
-      AssertThrow(false, ExcInternalError());
+      Assert(false, ExcInternalError());
       // what follows is dead code, but it avoids warnings about the lack
       // of a return value
       return 0;
@@ -3563,7 +3563,7 @@ next_cell:
       if (matching == m_ftf) return 2;                   // [false,true ,false]
       static const MATCH_T m_ftt = {{ 1 , 0 , 3 , 2 }};
       if (matching == m_ftt) return 6;                   // [false,true ,true ]
-      AssertThrow(false, ExcInternalError());
+      Assert(false, ExcInternalError());
       // what follows is dead code, but it avoids warnings about the lack
       // of a return value
       return 0;

diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index c3800c2b8c93e02e4a09b53b9b59a389c3dc68c9..6a5ac441059410d84a6e51ba082e81450e5ba9be 100644 (file)
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -1689,7 +1689,7 @@ namespace internal
               default:
                 // in 1d, a node must have one or two adjacent lines
                 if (spacedim==1)
-                  AssertThrow (false, ExcInternalError())
+                  Assert (false, ExcInternalError())
                   else
                     AssertThrow (false,
                                  ExcMessage ("You have a vertex in your triangulation "

diff --git a/source/lac/lapack_full_matrix.cc b/source/lac/lapack_full_matrix.cc
index e07aca8e117438d4bf102fa966085dee4f7aef3a..29029c4ddc9930a1aca43b560bb94d16acfbf88d 100644 (file)
--- a/source/lac/lapack_full_matrix.cc
+++ b/source/lac/lapack_full_matrix.cc
@@ -468,7 +468,7 @@ LAPACKFullMatrix<number>::compute_lu_factorization()
   int info = 0;
   getrf(&mm, &nn, values, &mm, &ipiv[0], &info);
 
-  AssertThrow(info >= 0, ExcInternalError());
+  Assert(info >= 0, ExcInternalError());
   AssertThrow(info == 0, LACExceptions::ExcSingular());
 
   state = lu;
@@ -559,14 +559,14 @@ LAPACKFullMatrix<number>::invert()
     {
       getrf(&mm, &nn, values, &mm, &ipiv[0], &info);
 
-      AssertThrow(info >= 0, ExcInternalError());
+      Assert(info >= 0, ExcInternalError());
       AssertThrow(info == 0, LACExceptions::ExcSingular());
     }
 
   inv_work.resize (mm);
   getri(&mm, values, &mm, &ipiv[0], &inv_work[0], &mm, &info);
 
-  AssertThrow(info >= 0, ExcInternalError());
+  Assert(info >= 0, ExcInternalError());
   AssertThrow(info == 0, LACExceptions::ExcSingular());
 
   state = inverse_matrix;
@@ -591,7 +591,7 @@ LAPACKFullMatrix<number>::apply_lu_factorization(Vector<number> &v,
   getrs(trans, &nn, &one, values, &nn, &ipiv[0],
         v.begin(), &nn, &info);
 
-  AssertThrow(info == 0, ExcInternalError());
+  Assert(info == 0, ExcInternalError());
 }
 
 
@@ -613,7 +613,7 @@ LAPACKFullMatrix<number>::apply_lu_factorization(LAPACKFullMatrix<number> &B,
 
   getrs(trans, &nn, &kk, values, &nn, &ipiv[0], &B.values[0], &nn, &info);
 
-  AssertThrow(info == 0, ExcInternalError());
+  Assert(info == 0, ExcInternalError());
 }