From d762c1394005865a86477052aef68f871223e684 Mon Sep 17 00:00:00 2001 From: guido Date: Wed, 24 Aug 2005 10:27:30 +0000 Subject: [PATCH] duplicate exceptions removed git-svn-id: https://svn.dealii.org/trunk@11318 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 4 - deal.II/deal.II/include/dofs/dof_handler.h | 4 - deal.II/deal.II/include/fe/fe.h | 10 -- deal.II/deal.II/include/fe/fe_nedelec.h | 5 - .../deal.II/include/fe/fe_raviart_thomas.h | 5 - deal.II/deal.II/include/grid/grid_generator.h | 1 + .../deal.II/include/grid/persistent_tria.h | 4 - deal.II/deal.II/include/grid/tria.h | 56 +++++++-- deal.II/deal.II/include/grid/tria_accessor.h | 4 - .../include/grid/tria_accessor.templates.h | 2 +- deal.II/deal.II/include/grid/tria_boundary.h | 13 -- .../include/multigrid/mg_dof_accessor.h | 5 - .../deal.II/include/numerics/time_dependent.h | 4 - deal.II/deal.II/include/numerics/vectors.h | 4 - deal.II/deal.II/source/dofs/dof_accessor.cc | 2 +- deal.II/deal.II/source/dofs/dof_handler.cc | 79 ++++++------ deal.II/deal.II/source/fe/fe_nedelec.cc | 2 +- .../deal.II/source/fe/fe_raviart_thomas.cc | 14 +-- .../deal.II/source/grid/persistent_tria.cc | 2 +- deal.II/deal.II/source/grid/tria.cc | 116 +++++++++--------- deal.II/deal.II/source/grid/tria_accessor.cc | 12 +- deal.II/deal.II/source/grid/tria_boundary.cc | 16 +-- .../deal.II/source/grid/tria_boundary_lib.cc | 16 +-- .../source/multigrid/mg_dof_accessor.cc | 2 +- .../deal.II/source/numerics/time_dependent.cc | 6 +- 25 files changed, 178 insertions(+), 210 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index 62927533ca..3f486b48d1 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -1458,10 +1458,6 @@ class DoFCellAccessor : public DoFObjectAccessor void set_dof_values_by_interpolation (const Vector &local_values, OutputVector &values) const; - /** - * Exception - */ - DeclException0 (ExcNotUsefulForThisDimension); }; diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index 8efef09bd5..0aed877576 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -1158,10 +1158,6 @@ class DoFHandler : public Subscriptor, DeclException1 (ExcMatrixHasWrongSize, int, << "The matrix has the wrong dimension " << arg1); - /** - * Exception - */ - DeclException0 (ExcFunctionNotUseful); /** * Exception */ diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index 48cc8571f6..6c5e66119b 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -173,16 +173,6 @@ class FiniteElement : public FiniteElementBase * @ingroup Exceptions */ DeclException0 (ExcJacobiDeterminantHasWrongSign); - /** - * Exception - * - * @ingroup Exceptions - */ - DeclException1 (ExcComputationNotUseful, - int, - << "The computation you required from this function is not " - << "feasible or not probable in the present dimension (" - << arg1 << ") because it would be prohibitively expensive."); protected: diff --git a/deal.II/deal.II/include/fe/fe_nedelec.h b/deal.II/deal.II/include/fe/fe_nedelec.h index 644e4d414e..f5b06b2935 100644 --- a/deal.II/deal.II/include/fe/fe_nedelec.h +++ b/deal.II/deal.II/include/fe/fe_nedelec.h @@ -380,11 +380,6 @@ class FE_Nedelec : public FiniteElement */ static const unsigned int n_constraint_matrices; }; - /** - * Exception - */ - DeclException0 (ExcNotUsefulInThisDimension); - protected: /** * @p clone function instead of diff --git a/deal.II/deal.II/include/fe/fe_raviart_thomas.h b/deal.II/deal.II/include/fe/fe_raviart_thomas.h index 6c50fa1d29..0cea7b8eb6 100644 --- a/deal.II/deal.II/include/fe/fe_raviart_thomas.h +++ b/deal.II/deal.II/include/fe/fe_raviart_thomas.h @@ -297,11 +297,6 @@ class FE_RaviartThomas : public FiniteElement */ virtual unsigned int memory_consumption () const; - /** - * Exception - */ - DeclException0 (ExcNotUsefulInThisDimension); - protected: virtual FiniteElement * clone() const; diff --git a/deal.II/deal.II/include/grid/grid_generator.h b/deal.II/deal.II/include/grid/grid_generator.h index b490ef9074..84a47c5439 100644 --- a/deal.II/deal.II/include/grid/grid_generator.h +++ b/deal.II/deal.II/include/grid/grid_generator.h @@ -113,6 +113,7 @@ template class SparseMatrix; * transform (simple-shaped) grids to a more complicated ones, like a * shell onto a grid of an airfoil, for example. * + * @ingroup grid * @author Wolfgang Bangerth, Ralf Hartmann, Guido Kanschat, Stefan Nauber, Joerg Weimar, 1998, 1999, 2000, 2001, 2002, 2003. */ class GridGenerator diff --git a/deal.II/deal.II/include/grid/persistent_tria.h b/deal.II/deal.II/include/grid/persistent_tria.h index 90bf4a8662..eec385505c 100644 --- a/deal.II/deal.II/include/grid/persistent_tria.h +++ b/deal.II/deal.II/include/grid/persistent_tria.h @@ -248,10 +248,6 @@ class PersistentTriangulation : public Triangulation */ virtual unsigned int memory_consumption () const; - /** - * Exception. - */ - DeclException0 (ExcFunctionNotUseful); /** * Exception. */ diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index 4e4b5601d0..cec405425d 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -2981,6 +2981,7 @@ class Triangulation : public Subscriptor /*@{*/ /** * Exception + * @ingroup Exceptions */ DeclException1 (ExcInvalidLevel, int, @@ -2988,37 +2989,46 @@ class Triangulation : public Subscriptor << " is not in the valid range!"); /** * Exception + * @ingroup Exceptions */ DeclException0 (ExcCellShouldBeUnused); /** * Exception + * @ingroup Exceptions */ DeclException0 (ExcTooFewVerticesAllocated); /** * Exception + * @ingroup Exceptions */ DeclException0 (ExcUncaughtState); /** - * Exception - */ - DeclException0 (ExcFunctionNotUseful); - /** - * Exception + * Exception + * @ingroup Exceptions */ DeclException2 (ExcGridsDoNotMatch, int, int, << "The present grid has " << arg1 << " active cells, " << "but the one in the file had " << arg2); /** - * Exception + * Trying to re-read a grid, an error occured. + * + * @ingroup Exceptions */ DeclException0 (ExcGridReadError); /** - * Exception + * The function raising this + * exception can only operate on + * an empty Triangulation, i.e., + * a Triangulation without grid + * cells. + * + * @ingroup Exceptions */ DeclException0 (ExcTriangulationNotEmpty); /** - * Exception + * Exception + * @ingroup Exceptions */ DeclException1 (ExcGridHasInvalidCell, int, @@ -3026,24 +3036,36 @@ class Triangulation : public Subscriptor << ". Read the docs and the source code " << "for more information."); /** - * Exception + * Exception + * @ingroup Exceptions */ DeclException0 (ExcGridHasInvalidVertices); /** - * Exception + * Exception + * @ingroup Exceptions */ DeclException1 (ExcInternalErrorOnCell, int, << "Something went wrong upon construction of cell " << arg1); /** - * Exception + * A cell was entered which has + * negative measure. In most + * cases, this is due to a wrong + * order of the vertices of the + * cell. + * + * @ingroup Exceptions */ DeclException1 (ExcCellHasNegativeMeasure, int, << "Cell " << arg1 << " has negative measure."); /** - * Exception + * A cell is created with a + * vertex number exceeding the + * vertex array. + * + * @ingroup Exceptions */ DeclException3 (ExcInvalidVertexIndex, int, int, int, @@ -3052,6 +3074,7 @@ class Triangulation : public Subscriptor << arg3 << "."); /** * Exception + * @ingroup Exceptions */ DeclException2 (ExcLineInexistant, int, int, @@ -3060,6 +3083,7 @@ class Triangulation : public Subscriptor << arg2 << " does not exist."); /** * Exception + * @ingroup Exceptions */ DeclException4 (ExcQuadInexistant, int, int, int, int, @@ -3068,21 +3092,27 @@ class Triangulation : public Subscriptor << ", " << arg3 << ", " << arg4 << " does not exist."); /** * Exception + * @ingroup Exceptions */ DeclException0 (ExcInteriorLineCantBeBoundary); /** * Exception + * @ingroup Exceptions */ DeclException0 (ExcInteriorQuadCantBeBoundary); /** * Exception + * @ingroup Exceptions */ DeclException2 (ExcMultiplySetLineInfoOfLine, int, int, << "In SubCellData the line info of the line with vertex indices " << arg1 << " and " << arg2 << " is multiply set."); /** - * Exception + * The triangulation level you + * accessed is empty. + * + * @ingroup Exceptions */ DeclException1 (ExcEmptyLevel, int, diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index ca34927df5..8020796c75 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -264,10 +264,6 @@ class TriaAccessor /** * @ingroup Exceptions */ - DeclException0 (ExcNotUsefulForThisDimension); - /** - * @ingroup Exceptions - */ DeclException0 (ExcCantCompareIterators); /** * @ingroup Exceptions diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index 94cabd7d9a..9adff0ac21 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -840,7 +840,7 @@ inline TriaIterator<1,TriaObjectAccessor<0, 1> > CellAccessor<1>::face (const unsigned int) const { - Assert (false, TriaAccessor<1>::ExcNotUsefulForThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return TriaIterator<1,TriaObjectAccessor<0, 1> >(); } diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 5f499bbed9..c9b5dbdf46 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -247,19 +247,6 @@ class Boundary : public Subscriptor virtual void get_normals_at_vertices (const typename Triangulation::face_iterator &face, FaceVertexNormals &face_vertex_normals) const; - - - /** - * Exception. - */ - DeclException0 (ExcPureVirtualFunctionCalled); - - /** - * Exception. - */ - DeclException1 (ExcFunctionNotUseful, - int, - << "The function called is not useful for dim=" << arg1 << "."); }; diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index cf16bf6854..16e360eee2 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -676,11 +676,6 @@ class MGDoFCellAccessor : public MGDoFObjectAccessor { TriaIterator > neighbor_child_on_subface (const unsigned int face_no, const unsigned int subface_no) const; - - /** - * Exception - */ - DeclException0 (ExcNotUsefulForThisDimension); }; /*@}*/ diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index a61b06bb5e..b67dbbb0af 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -1001,10 +1001,6 @@ class TimeStepBase : public Subscriptor */ virtual unsigned int memory_consumption () const; - /** - * Exception - */ - DeclException0 (ExcPureVirtualFunctionCalled); /** * Exception */ diff --git a/deal.II/deal.II/include/numerics/vectors.h b/deal.II/deal.II/include/numerics/vectors.h index afa1f7112e..22447c2012 100644 --- a/deal.II/deal.II/include/numerics/vectors.h +++ b/deal.II/deal.II/include/numerics/vectors.h @@ -961,10 +961,6 @@ class VectorTools const InVector &v, const unsigned int component); - /** - * Exception - */ - DeclException0 (ExcNotUseful); /** * Exception */ diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 3a02b9e333..36b9f1798a 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -399,7 +399,7 @@ template <> TriaIterator<1, DoFObjectAccessor<0,1> > DoFCellAccessor<1>::face (const unsigned int) const { - Assert (false, ExcNotUsefulForThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return TriaIterator<1, DoFObjectAccessor<0,1> >(); } diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index a541cab9b3..05f666fb7b 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -135,7 +135,7 @@ template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::begin_raw_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -144,7 +144,7 @@ template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::begin_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -153,7 +153,7 @@ template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::begin_active_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -162,7 +162,7 @@ template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::end_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -171,7 +171,7 @@ template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -180,7 +180,7 @@ template <> DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -189,7 +189,7 @@ template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -198,7 +198,7 @@ template <> DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -207,7 +207,7 @@ template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -216,7 +216,6 @@ template <> DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); return 0; } @@ -225,7 +224,7 @@ template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::begin_raw_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -234,7 +233,7 @@ template <> DoFHandler<1>::quad_iterator DoFHandler<1>::begin_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -243,7 +242,7 @@ template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::begin_active_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -252,7 +251,7 @@ template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::end_quad () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -261,7 +260,7 @@ template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -270,7 +269,7 @@ template <> DoFHandler<1>::quad_iterator DoFHandler<1>::last_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -279,7 +278,7 @@ template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -288,7 +287,7 @@ template <> DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -297,7 +296,7 @@ template <> DoFHandler<1>::quad_iterator DoFHandler<1>::last_quad () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -306,7 +305,7 @@ template <> DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -315,7 +314,7 @@ template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::begin_raw_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -324,7 +323,7 @@ template <> DoFHandler<1>::hex_iterator DoFHandler<1>::begin_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -333,7 +332,7 @@ template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::begin_active_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -342,7 +341,7 @@ template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::end_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -351,7 +350,7 @@ template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -360,7 +359,7 @@ template <> DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -369,7 +368,7 @@ template <> DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -378,7 +377,7 @@ template <> DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -387,7 +386,7 @@ template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -396,7 +395,7 @@ template <> DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -569,7 +568,7 @@ template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::begin_raw_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -578,7 +577,7 @@ template <> DoFHandler<2>::hex_iterator DoFHandler<2>::begin_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -587,7 +586,7 @@ template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::begin_active_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -596,7 +595,7 @@ template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::end_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -605,7 +604,7 @@ template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -614,7 +613,7 @@ template <> DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -623,7 +622,7 @@ template <> DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -632,7 +631,7 @@ template <> DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -641,7 +640,7 @@ template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex (const unsigned int) const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -650,7 +649,7 @@ template <> DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex () const { - Assert (false, ExcNotImplemented()); + Assert (false, ExcImpossibleInDim(2)); return 0; } diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index 32a98161ee..bf1c410234 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -40,7 +40,7 @@ FE_Nedelec::FE_Nedelec (const unsigned int degree) std::vector(dim,true))), degree(degree) { - Assert (dim >= 2, ExcNotUsefulInThisDimension()); + Assert (dim >= 2, ExcImpossibleInDim(dim)); // copy constraint and embedding // matrices if they are diff --git a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc index de29a04b6a..e4b1df845e 100644 --- a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc +++ b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc @@ -140,7 +140,7 @@ FE_RaviartThomas::FE_RaviartThomas (const unsigned int rt_order) polynomials (create_polynomials(rt_order)), renumber (compute_renumber(rt_order)) { - Assert (dim >= 2, ExcNotUsefulInThisDimension()); + Assert (dim >= 2, ExcImpossibleInDim(dim)); // check formula (III.3.22) in the // book by Brezzi & Fortin about @@ -290,7 +290,7 @@ FE_RaviartThomas<1>:: get_interpolation_matrix (const FiniteElementBase<1> &, FullMatrix &) const { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -428,7 +428,7 @@ template <> void FE_RaviartThomas<1>::initialize_constraints () { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -925,7 +925,7 @@ template <> std::vector FE_RaviartThomas<1>::get_dpo_vector (const unsigned int) { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return std::vector(); } @@ -964,7 +964,7 @@ template <> std::vector FE_RaviartThomas<1>::get_ria_vector (const unsigned int) { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return std::vector(); } @@ -1016,7 +1016,7 @@ template <> std::vector > FE_RaviartThomas<1>::create_polynomials (const unsigned int) { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return std::vector > (); } @@ -1133,7 +1133,7 @@ template <> std::vector > FE_RaviartThomas<1>::compute_renumber (const unsigned int) { - Assert (false, ExcNotUsefulInThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return std::vector > (); } diff --git a/deal.II/deal.II/source/grid/persistent_tria.cc b/deal.II/deal.II/source/grid/persistent_tria.cc index 05fa79c646..0aaf528474 100644 --- a/deal.II/deal.II/source/grid/persistent_tria.cc +++ b/deal.II/deal.II/source/grid/persistent_tria.cc @@ -123,7 +123,7 @@ PersistentTriangulation::create_triangulation (const std::vector const std::vector > &, const SubCellData &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(dim)); } diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 888ea42df7..39efc3904a 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -2014,7 +2014,7 @@ void Triangulation::load_user_flags_line (const std::vector &v) template <> void Triangulation<1>::save_user_flags_quad (std::ostream &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2022,7 +2022,7 @@ void Triangulation<1>::save_user_flags_quad (std::ostream &) const template <> void Triangulation<1>::save_user_flags_quad (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2030,7 +2030,7 @@ void Triangulation<1>::save_user_flags_quad (std::vector &) const template <> void Triangulation<1>::load_user_flags_quad (std::istream &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2038,7 +2038,7 @@ void Triangulation<1>::load_user_flags_quad (std::istream &) template <> void Triangulation<1>::load_user_flags_quad (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2046,7 +2046,7 @@ void Triangulation<1>::load_user_flags_quad (const std::vector &) template <> void Triangulation<1>::save_user_flags_hex (std::ostream &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2054,7 +2054,7 @@ void Triangulation<1>::save_user_flags_hex (std::ostream &) const template <> void Triangulation<1>::save_user_flags_hex (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2062,7 +2062,7 @@ void Triangulation<1>::save_user_flags_hex (std::vector &) const template <> void Triangulation<1>::load_user_flags_hex (std::istream &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2070,7 +2070,7 @@ void Triangulation<1>::load_user_flags_hex (std::istream &) template <> void Triangulation<1>::load_user_flags_hex (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -2132,7 +2132,7 @@ void Triangulation::load_user_flags_quad (const std::vector &v) template <> void Triangulation<2>::save_user_flags_hex (std::ostream &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2140,7 +2140,7 @@ void Triangulation<2>::save_user_flags_hex (std::ostream &) const template <> void Triangulation<2>::save_user_flags_hex (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2148,7 +2148,7 @@ void Triangulation<2>::save_user_flags_hex (std::vector &) const template <> void Triangulation<2>::load_user_flags_hex (std::istream &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2156,7 +2156,7 @@ void Triangulation<2>::load_user_flags_hex (std::istream &) template <> void Triangulation<2>::load_user_flags_hex (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2312,7 +2312,7 @@ void Triangulation::load_user_pointers_line (const std::vector &v) template <> void Triangulation<1>::save_user_pointers_quad (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2320,7 +2320,7 @@ void Triangulation<1>::save_user_pointers_quad (std::vector &) const template <> void Triangulation<1>::load_user_pointers_quad (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2328,7 +2328,7 @@ void Triangulation<1>::load_user_pointers_quad (const std::vector &) template <> void Triangulation<1>::save_user_pointers_hex (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } @@ -2336,7 +2336,7 @@ void Triangulation<1>::save_user_pointers_hex (std::vector &) const template <> void Triangulation<1>::load_user_pointers_hex (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -2375,7 +2375,7 @@ void Triangulation::load_user_pointers_quad (const std::vector &v) template <> void Triangulation<2>::save_user_pointers_hex (std::vector &) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2383,7 +2383,7 @@ void Triangulation<2>::save_user_pointers_hex (std::vector &) const template <> void Triangulation<2>::load_user_pointers_hex (const std::vector &) { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); } @@ -2498,7 +2498,7 @@ template <> Triangulation<1>::raw_face_iterator Triangulation<1>::begin_raw_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2508,7 +2508,7 @@ template <> Triangulation<1>::face_iterator Triangulation<1>::begin_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2518,7 +2518,7 @@ template <> Triangulation<1>::active_face_iterator Triangulation<1>::begin_active_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2528,7 +2528,7 @@ template <> Triangulation<1>::raw_face_iterator Triangulation<1>::end_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2538,7 +2538,7 @@ template <> Triangulation<1>::raw_face_iterator Triangulation<1>::last_raw_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2548,7 +2548,7 @@ template <> Triangulation<1>::raw_face_iterator Triangulation<1>::last_raw_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2558,7 +2558,7 @@ template <> Triangulation<1>::face_iterator Triangulation<1>::last_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2568,7 +2568,7 @@ template <> Triangulation<1>::face_iterator Triangulation<1>::last_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2578,7 +2578,7 @@ template <> Triangulation<1>::active_face_iterator Triangulation<1>::last_active_face () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2588,7 +2588,7 @@ template <> Triangulation<1>::active_face_iterator Triangulation<1>::last_active_face (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2598,7 +2598,7 @@ template <> Triangulation<1>::raw_quad_iterator Triangulation<1>::begin_raw_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2608,7 +2608,7 @@ template <> Triangulation<1>::quad_iterator Triangulation<1>::begin_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2618,7 +2618,7 @@ template <> Triangulation<1>::active_quad_iterator Triangulation<1>::begin_active_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2628,7 +2628,7 @@ template <> Triangulation<1>::raw_quad_iterator Triangulation<1>::end_quad () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2638,7 +2638,7 @@ template <> Triangulation<1>::raw_quad_iterator Triangulation<1>::last_raw_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2648,7 +2648,7 @@ template <> Triangulation<1>::raw_quad_iterator Triangulation<1>::last_raw_quad () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2658,7 +2658,7 @@ template <> Triangulation<1>::quad_iterator Triangulation<1>::last_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2668,7 +2668,7 @@ template <> Triangulation<1>::quad_iterator Triangulation<1>::last_quad () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2678,7 +2678,7 @@ template <> Triangulation<1>::active_quad_iterator Triangulation<1>::last_active_quad (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2688,7 +2688,7 @@ template <> Triangulation<1>::active_quad_iterator Triangulation<1>::last_active_quad () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2698,7 +2698,7 @@ template <> Triangulation<1>::raw_hex_iterator Triangulation<1>::begin_raw_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2708,7 +2708,7 @@ template <> Triangulation<1>::hex_iterator Triangulation<1>::begin_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2718,7 +2718,7 @@ template <> Triangulation<1>::active_hex_iterator Triangulation<1>::begin_active_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2728,7 +2728,7 @@ template <> Triangulation<1>::raw_hex_iterator Triangulation<1>::end_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2738,7 +2738,7 @@ template <> Triangulation<1>::raw_hex_iterator Triangulation<1>::last_raw_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2748,7 +2748,7 @@ template <> Triangulation<1>::raw_hex_iterator Triangulation<1>::last_raw_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2758,7 +2758,7 @@ template <> Triangulation<1>::hex_iterator Triangulation<1>::last_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2768,7 +2768,7 @@ template <> Triangulation<1>::hex_iterator Triangulation<1>::last_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2778,7 +2778,7 @@ template <> Triangulation<1>::active_hex_iterator Triangulation<1>::last_active_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2788,7 +2788,7 @@ template <> Triangulation<1>::active_hex_iterator Triangulation<1>::last_active_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(1)); return 0; } @@ -2963,7 +2963,7 @@ template <> Triangulation<2>::raw_hex_iterator Triangulation<2>::begin_raw_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -2973,7 +2973,7 @@ template <> Triangulation<2>::hex_iterator Triangulation<2>::begin_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -2983,7 +2983,7 @@ template <> Triangulation<2>::active_hex_iterator Triangulation<2>::begin_active_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -2993,7 +2993,7 @@ template <> Triangulation<2>::raw_hex_iterator Triangulation<2>::end_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3003,7 +3003,7 @@ template <> Triangulation<2>::raw_hex_iterator Triangulation<2>::last_raw_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3013,7 +3013,7 @@ template <> Triangulation<2>::raw_hex_iterator Triangulation<2>::last_raw_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3023,7 +3023,7 @@ template <> Triangulation<2>::hex_iterator Triangulation<2>::last_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3033,7 +3033,7 @@ template <> Triangulation<2>::hex_iterator Triangulation<2>::last_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3043,7 +3043,7 @@ template <> Triangulation<2>::active_hex_iterator Triangulation<2>::last_active_hex (const unsigned int) const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } @@ -3053,7 +3053,7 @@ template <> Triangulation<2>::active_hex_iterator Triangulation<2>::last_active_hex () const { - Assert (false, ExcFunctionNotUseful()); + Assert (false, ExcImpossibleInDim(2)); return 0; } diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index dc5ce42603..396bfe2297 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -174,7 +174,7 @@ void TriaObjectAccessor<1, dim>::clear_children () const template unsigned char TriaObjectAccessor<1, dim>::boundary_indicator () const { - Assert (dim>=2, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim>=2, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->lines.material_id[this->present_index]; @@ -185,7 +185,7 @@ unsigned char TriaObjectAccessor<1, dim>::boundary_indicator () const template void TriaObjectAccessor<1, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { - Assert (dim>=2, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim>=2, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->lines.material_id[this->present_index] = boundary_ind; @@ -404,7 +404,7 @@ void TriaObjectAccessor<2, dim>::clear_children () const template unsigned char TriaObjectAccessor<2, dim>::boundary_indicator () const { - Assert (dim>=3, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim>=3, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->quads.material_id[this->present_index]; @@ -415,7 +415,7 @@ unsigned char TriaObjectAccessor<2, dim>::boundary_indicator () const template void TriaObjectAccessor<2, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { - Assert (dim>=3, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim>=3, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->quads.material_id[this->present_index] = boundary_ind; @@ -844,7 +844,7 @@ void TriaObjectAccessor<3, dim>::clear_children () const template unsigned char TriaObjectAccessor<3, dim>::boundary_indicator () const { - Assert (dim<4, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim<4, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->hexes.material_id[this->present_index]; @@ -855,7 +855,7 @@ unsigned char TriaObjectAccessor<3, dim>::boundary_indicator () const template void TriaObjectAccessor<3, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { - Assert (dim<4, typename TriaAccessor::ExcNotUsefulForThisDimension()); + Assert (dim<4, ExcImpossibleInDim(dim)); Assert (used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.material_id[this->present_index] = boundary_ind; diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index 60854be6e4..dd917dd1be 100644 --- a/deal.II/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/deal.II/source/grid/tria_boundary.cc @@ -34,7 +34,7 @@ template Point Boundary::get_new_point_on_quad (const typename Triangulation::quad_iterator &) const { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); return Point(); } @@ -46,7 +46,7 @@ Boundary:: get_intermediate_points_on_line (const typename Triangulation::line_iterator &, std::vector > &) const { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } @@ -57,7 +57,7 @@ Boundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &, std::vector > &) const { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } @@ -68,7 +68,7 @@ Boundary:: get_normals_at_vertices (const typename Triangulation::face_iterator &, FaceVertexNormals &) const { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } @@ -96,7 +96,7 @@ template Point StraightBoundary::get_new_point_on_quad (const typename Triangulation::quad_iterator &) const { - Assert (false, typename Boundary::ExcFunctionNotUseful(dim)); + Assert (false, ExcImpossibleInDim(dim)); return Point(); } @@ -167,7 +167,7 @@ StraightBoundary<1>:: get_intermediate_points_on_line (const Triangulation<1>::line_iterator &, std::vector > &) const { - Assert(false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert(false, ExcImpossibleInDim(1)); } @@ -205,7 +205,7 @@ StraightBoundary:: get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &, std::vector > &) const { - Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); + Assert(false, ExcImpossibleInDim(dim)); } #else @@ -254,7 +254,7 @@ StraightBoundary<1>:: get_normals_at_vertices (const Triangulation<1>::face_iterator &, Boundary<1>::FaceVertexNormals &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #endif diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc index 119237eb44..fe583730fd 100644 --- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc +++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc @@ -80,7 +80,7 @@ Point CylinderBoundary:: get_new_point_on_quad (const typename Triangulation::quad_iterator &) const { - Assert (false, typename Boundary::ExcFunctionNotUseful(dim)); + Assert (false, ExcImpossibleInDim(dim)); return Point(); } @@ -178,7 +178,7 @@ CylinderBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, std::vector > &) const { - Assert (false, typename Boundary::ExcFunctionNotUseful(dim)); + Assert (false, ExcImpossibleInDim(dim)); } @@ -191,7 +191,7 @@ CylinderBoundary<1>:: get_normals_at_vertices (const Triangulation<1>::face_iterator &, Boundary<1>::FaceVertexNormals &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -303,7 +303,7 @@ HyperBallBoundary<1>::get_intermediate_points_on_line ( const Triangulation<1>::line_iterator &, std::vector > &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #else @@ -445,7 +445,7 @@ HyperBallBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, std::vector > &) const { - Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); + Assert(false, ExcImpossibleInDim(dim)); } @@ -458,7 +458,7 @@ HyperBallBoundary<1>:: get_normals_at_vertices (const Triangulation<1>::face_iterator &, Boundary<1>::FaceVertexNormals &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -616,7 +616,7 @@ HalfHyperBallBoundary<1>:: get_normals_at_vertices (const Triangulation<1>::face_iterator &, Boundary<1>::FaceVertexNormals &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #endif @@ -785,7 +785,7 @@ HalfHyperShellBoundary<1>:: get_normals_at_vertices (const Triangulation<1>::face_iterator &, Boundary<1>::FaceVertexNormals &) const { - Assert (false, Boundary<1>::ExcFunctionNotUseful(1)); + Assert (false, ExcImpossibleInDim(1)); } #endif diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index 6ad8ab2f13..f692566d3f 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -656,7 +656,7 @@ template <> MGDoFCellAccessor<1>::face_iterator MGDoFCellAccessor<1>::face (const unsigned int) const { - Assert (false, ExcNotUsefulForThisDimension()); + Assert (false, ExcImpossibleInDim(1)); return face_iterator(); } diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index 551d6242c3..8267832956 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -317,7 +317,7 @@ TimeStepBase::init_for_postprocessing () void TimeStepBase::solve_dual_problem () { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } @@ -325,7 +325,7 @@ TimeStepBase::solve_dual_problem () void TimeStepBase::postprocess_timestep () { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } @@ -415,7 +415,7 @@ TimeStepBase_Tria::TimeStepBase_Tria() : flags (), refinement_flags(0) { - Assert (false, ExcPureVirtualFunctionCalled()); + Assert (false, ExcPureFunctionCalled()); } -- 2.39.5