From 2f8f19ef18780bdd30eb3abbb6059c8b9545d9c5 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 16 Apr 2013 14:42:48 +0000 Subject: [PATCH] Remove obsolete exceptions git-svn-id: https://svn.dealii.org/trunk@29299 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/exceptions.h | 79 +++-------------------- deal.II/source/base/function_parser.cc | 12 ++-- 2 files changed, 16 insertions(+), 75 deletions(-) diff --git a/deal.II/include/deal.II/base/exceptions.h b/deal.II/include/deal.II/base/exceptions.h index b7dba69576..613252055e 100644 --- a/deal.II/include/deal.II/base/exceptions.h +++ b/deal.II/include/deal.II/base/exceptions.h @@ -75,7 +75,7 @@ public: * well as the violated condition and the name of the exception as * a char pointer. */ - void set_fields (const char *f, + void set_fields (const char *file, const int line, const char *function, const char *cond, @@ -786,17 +786,9 @@ namespace StandardExceptions << arg1); /** - * Exception used when running into functions that are only supported - * in a backward compatibility mode. + * Parallel vectors with ghost elements are read-only vectors. */ - DeclException1 (ExcCompatibility, - char *, - << "You are using a backward compatibility feature\n" - << "that you have disabled during configuration of\n" - << "the library by the --disable-compat=" - << arg1 << " switch. You should either use an\n" - << "alternative function, or configure again without\n" - << "this switch and recompile the library."); + DeclException0 (ExcGhostsPresent); /** * Some of our numerical classes allow for setting alll entries to @@ -808,53 +800,25 @@ namespace StandardExceptions DeclException0 (ExcScalarAssignmentOnlyForZeroValue); /** - * This function requires the LAPACK library. Please reconfigure using - * the option --with-lapack and check if it is actually included. + * This function requires support for the LAPACK library. */ DeclException0 (ExcNeedsLAPACK); /** - * This function requires the UMFPack library. Please reconfigure - * using the option --with-umfpack and check if it is actually - * included. - */ - DeclException0 (ExcNeedsUMFPACK); - - /** - * This function requires the METIS library. Please reconfigure using - * the option --with-metis and check if it is actually included. - */ - DeclException0 (ExcNeedsMETIS); - - /** - * This function requires the Petsc library. Please reconfigure using - * the option --with-petsc and check if it is actually included. - */ - DeclException0 (ExcNeedsPETSC); - - /** - * This function requires the NetCDF library, which is neither in your - * standard path nor configured with --with-netcdf. + * This function requires support for the NetCDF library. */ DeclException0 (ExcNeedsNetCDF); /** - * Parallel vectors with ghost elements are read-only vectors. + * This function requires support for the FunctionParser library. */ - DeclException0 (ExcGhostsPresent); + DeclException0 (ExcNeedsFunctionparser); - /** - * A configuration option disabled this feature. In order to use it, - * you must reconfigure and recompile the libraries. - */ - DeclException1 (ExcDisabled, char *, - << "This feature was disabled by the " - "configuration option --disable-" - << arg1 << ". Reconfigure to use it!"); //@} } /*namespace StandardExceptions*/ + /** * Special assertion for dimension mismatch. * @@ -868,6 +832,7 @@ namespace StandardExceptions #define AssertDimension(dim1,dim2) Assert((dim1) == (dim2), \ ExcDimensionMismatch((dim1),(dim2))) + /** * Special assertion, testing whether vec has size * dim1, and each entry of the vector has the @@ -879,6 +844,7 @@ namespace StandardExceptions #define AssertVectorVectorDimension(vec,dim1,dim2) AssertDimension((vec).size(), (dim1)) \ for (unsigned int i=0;i::initialize(const std::string &, const bool, const bool) { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); } @@ -293,7 +293,7 @@ FunctionParser::initialize(const std::string &, const bool, const bool) { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); } @@ -305,7 +305,7 @@ FunctionParser::initialize(const std::string &, const bool, const bool) { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); } @@ -318,7 +318,7 @@ FunctionParser::initialize(const std::string &, const bool, const bool) { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); } @@ -326,7 +326,7 @@ template double FunctionParser::value ( const Point &, unsigned int) const { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); return 0.; } @@ -335,7 +335,7 @@ template void FunctionParser::vector_value ( const Point &, Vector &) const { - Assert(false, ExcDisabled("parser")); + Assert(false, ExcNeedsFunctionparser()); } -- 2.39.5