From: Guido Kanschat Date: Wed, 23 Mar 2005 14:41:17 +0000 (+0000) Subject: another exception X-Git-Tag: v8.0.0~14324 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69551dfc5dfb8a69fe305412632a41f23e3f42ea;p=dealii.git another exception git-svn-id: https://svn.dealii.org/trunk@10214 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h index 98f7790064..37bdde6d77 100644 --- a/deal.II/lac/include/lac/vector.h +++ b/deal.II/lac/include/lac/vector.h @@ -710,14 +710,6 @@ class Vector unsigned int memory_consumption () const; //@} - /** @addtogroup Exceptions - * @{ */ - - /** - * Exception - */ - DeclException0 (ExcEmptyVector); - //@} protected: /** @@ -850,7 +842,7 @@ inline Vector & Vector::operator = (const Number s) { if (s != 0.) - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); if (dim!=0) std::fill (begin(), end(), s); return *this; diff --git a/deal.II/lac/include/lac/vector.templates.h b/deal.II/lac/include/lac/vector.templates.h index bd901547ec..f869714002 100644 --- a/deal.II/lac/include/lac/vector.templates.h +++ b/deal.II/lac/include/lac/vector.templates.h @@ -1,15 +1,15 @@ -//---------------------------- vector.templates.h --------------------------- +//--------------------------------------------------------------------------- // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors +// Copyright (C) 1998 - 2005 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer // to the file deal.II/doc/license.html for the text and // further information on this license. // -//---------------------------- vector.templates.h --------------------------- +//--------------------------------------------------------------------------- #ifndef __deal2__vector_templates_h #define __deal2__vector_templates_h @@ -162,7 +162,7 @@ template bool Vector::all_zero () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); const_iterator p = begin(), e = end(); @@ -178,7 +178,7 @@ template bool Vector::is_non_negative () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); const_iterator p = begin(), e = end(); @@ -194,7 +194,7 @@ template template Number Vector::operator * (const Vector& v) const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); if (this == reinterpret_cast*>(&v)) return norm_sqr(); @@ -230,7 +230,7 @@ Number Vector::operator * (const Vector& v) const template Number Vector::norm_sqr () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Number sum0 = 0, sum1 = 0, @@ -260,7 +260,7 @@ Number Vector::norm_sqr () const template Number Vector::mean_value () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Number sum0 = 0, sum1 = 0, @@ -291,7 +291,7 @@ Number Vector::mean_value () const template Number Vector::l1_norm () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Number sum0 = 0, sum1 = 0, @@ -328,7 +328,7 @@ Number Vector::l2_norm () const template Number Vector::lp_norm (const Number p) const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Number sum0 = 0, sum1 = 0, @@ -359,7 +359,7 @@ Number Vector::lp_norm (const Number p) const template Number Vector::linfty_norm () const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Number max0=0., max1=0., @@ -385,7 +385,7 @@ Number Vector::linfty_norm () const template Vector& Vector::operator += (const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); add (v); return *this; @@ -395,7 +395,7 @@ Vector& Vector::operator += (const Vector& v) template Vector& Vector::operator -= (const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), @@ -411,7 +411,7 @@ Vector& Vector::operator -= (const Vector& v) template void Vector::add (const Number v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); iterator i_ptr = begin(), i_end = end(); @@ -423,7 +423,7 @@ void Vector::add (const Number v) template void Vector::add (const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), @@ -437,7 +437,7 @@ void Vector::add (const Vector& v) template void Vector::add (const Number a, const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), @@ -452,7 +452,7 @@ template void Vector::add (const Number a, const Vector& v, const Number b, const Vector& w) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); Assert (dim == w.dim, ExcDimensionMismatch(dim, w.dim)); iterator i_ptr = begin(), @@ -467,7 +467,7 @@ void Vector::add (const Number a, const Vector& v, template void Vector::sadd (const Number x, const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), i_end = end(); @@ -481,7 +481,7 @@ template void Vector::sadd (const Number x, const Number a, const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), i_end = end(); @@ -496,7 +496,7 @@ void Vector::sadd (const Number x, const Number a, const Vector& v, const Number b, const Vector& w) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); Assert (dim == w.dim, ExcDimensionMismatch(dim, w.dim)); iterator i_ptr = begin(), @@ -514,7 +514,7 @@ void Vector::sadd (const Number x, const Number a, const Vector& w, const Number c, const Vector& y) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); Assert (dim == w.dim, ExcDimensionMismatch(dim, w.dim)); Assert (dim == y.dim, ExcDimensionMismatch(dim, y.dim)); @@ -533,7 +533,7 @@ void Vector::sadd (const Number x, const Number a, template void Vector::scale (const Number factor) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); iterator ptr = begin(); const const_iterator eptr = end(); @@ -547,7 +547,7 @@ template template void Vector::scale (const Vector &s) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == s.dim, ExcDimensionMismatch(dim, s.dim)); iterator ptr = begin(); @@ -563,7 +563,7 @@ template void Vector::equ (const Number a, const Vector& u, const Number b, const Vector& v) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == u.dim, ExcDimensionMismatch(dim, u.dim)); Assert (dim == v.dim, ExcDimensionMismatch(dim, v.dim)); iterator i_ptr = begin(), @@ -580,7 +580,7 @@ template template void Vector::equ (const Number a, const Vector& u) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == u.dim, ExcDimensionMismatch(dim, u.dim)); iterator i_ptr = begin(), i_end = end(); @@ -594,7 +594,7 @@ void Vector::equ (const Number a, const Vector& u) template void Vector::ratio (const Vector &a, const Vector &b) { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (a.dim == b.dim, ExcDimensionMismatch (a.dim, b.dim)); // no need to reinit with zeros, since @@ -689,7 +689,7 @@ template bool Vector::operator == (const Vector& v) const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); Assert (dim == v.size(), ExcDimensionMismatch(dim, v.size())); for (unsigned int i=0; i::operator == (const Vector& v) const template void Vector::print (const char* format) const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); if (!format) format = " %5.2f"; for (unsigned int j=0;j::print (std::ostream &out, const bool scientific, const bool across) const { - Assert (dim!=0, ExcEmptyVector()); + Assert (dim!=0, ExcEmptyObject()); AssertThrow (out, ExcIO()); std::ios::fmtflags old_flags = out.flags();