From: guido Date: Thu, 25 May 2000 15:52:03 +0000 (+0000) Subject: redundant exceptions removed X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930e34704b99342a19bde3ec8fe5ff3009344a01;p=dealii-svn.git redundant exceptions removed git-svn-id: https://svn.dealii.org/trunk@2944 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/function.h b/deal.II/base/include/base/function.h index 27a8884506..5b44c49f2d 100644 --- a/deal.II/base/include/base/function.h +++ b/deal.II/base/include/base/function.h @@ -255,25 +255,6 @@ class Function : public FunctionTime, */ virtual void vector_laplacian_list (const vector > &points, vector > &values) const; - - /** - * Exception - */ - DeclException0 (ExcPureFunctionCalled); - /** - * Exception - */ - DeclException2 (ExcVectorHasWrongSize, - int, int, - << "The vector has size " << arg1 << " but should have " - << arg2 << " elements."); - /** - * Exception - */ - DeclException2 (ExcWrongComponent, - int, int, - << "Component " << arg1 << " does not exist, as the values " - << "of this function have only " << arg2 << " components."); }; diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index 244b0c6d1f..7ce1f9fa73 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -57,7 +57,7 @@ void Function::value_list (const vector > &points, // the valid range is up to the // derived class Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; ivalue (points[i], component); @@ -72,7 +72,7 @@ void Function::vector_value_list (const vector > &points, // the valid range is up to the // derived class Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; ivector_value (points[i], values[i]); @@ -102,7 +102,7 @@ void Function::gradient_list (const vector > &points, const unsigned int component) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0; i::vector_gradient_list (const vector > &point vector > > &gradients) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0; i::vector_value (const Point &, Vector &return_value) const { Assert (return_value.size() == n_components, - ExcVectorHasWrongSize (return_value.size(), n_components)); + ExcDimensionMismatch (return_value.size(), n_components)); fill_n (return_value.begin(), n_components, 0.0); }; @@ -160,7 +160,7 @@ void ZeroFunction::value_list (const vector > &points, vector &values, const unsigned int /*component*/) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); fill_n (values.begin(), points.size(), 0.); }; @@ -171,12 +171,12 @@ void ZeroFunction::vector_value_list (const vector > &points, vector > &values) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; i::vector_gradient (const Point &, vector > &gradients) const { Assert (gradients.size() == n_components, - ExcVectorHasWrongSize(gradients.size(), n_components)); + ExcDimensionMismatch(gradients.size(), n_components)); for (unsigned int c=0; c::gradient_list (const vector > &points, const unsigned int /*component*/) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0; i::vector_gradient_list (const vector > &p vector > > &gradients) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0; i::vector_value (const Point &, Vector &return_value) const { Assert (return_value.size() == n_components, - ExcVectorHasWrongSize (return_value.size(), n_components)); + ExcDimensionMismatch (return_value.size(), n_components)); fill_n (return_value.begin(), n_components, function_value); }; @@ -266,7 +266,7 @@ void ConstantFunction::value_list (const vector > &points, vector &values, const unsigned int /*component*/) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); fill_n (values.begin(), points.size(), function_value); }; @@ -277,12 +277,12 @@ void ConstantFunction::vector_value_list (const vector > &points vector > &values) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; i::laplacian_list (const vector > &points, // the valid range is up to the // derived class Assert (laplacians.size() == points.size(), - ExcVectorHasWrongSize(laplacians.size(), points.size())); + ExcDimensionMismatch(laplacians.size(), points.size())); for (unsigned int i=0; ilaplacian (points[i], component); @@ -329,7 +329,7 @@ void Function::vector_laplacian_list (const vector > &points, // the valid range is up to the // derived class Assert (laplacians.size() == points.size(), - ExcVectorHasWrongSize(laplacians.size(), points.size())); + ExcDimensionMismatch(laplacians.size(), points.size())); for (unsigned int i=0; ivector_laplacian (points[i], laplacians[i]); diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 285335921a..13d8225c68 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -43,7 +43,7 @@ PillowFunction::value_list (const vector > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i::laplacian_list (const vector > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i::gradient_list (const vector > &points, const unsigned int) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0;i::value_list (const vector > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i::laplacian_list (const vector > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i::gradient_list (const vector > &points, const unsigned int) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0;i > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i > &points, const unsigned int) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); Assert(false, ExcNotImplemented()); } @@ -455,7 +455,7 @@ SlitSingularityFunction::value_list (const vector > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i > &points, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0;i > &points, const unsigned int) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); Assert(false, ExcNotImplemented()); } diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index a625d9b79f..b19ef8f130 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -50,7 +50,7 @@ TensorFunction::value_list (const vector > &points, vector > &values) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; ivalue (points[i]); @@ -72,7 +72,7 @@ TensorFunction::gradient_list (const vector > &points, vector > &gradients) const { Assert (gradients.size() == points.size(), - ExcVectorHasWrongSize(gradients.size(), points.size())); + ExcDimensionMismatch(gradients.size(), points.size())); for (unsigned int i=0; i::value_list (const vector > &points, const unsigned int n_points = points.size(); Assert (values.size() == n_points, - ExcVectorHasWrongSize (values.size(), n_points)); + ExcDimensionMismatch (values.size(), n_points)); Assert (component == 0, - ExcWrongComponent (component, 1)); + ExcIndexRange (component, 0, 1)); for (unsigned int i=0; i { */ virtual void value (const Point &p, Vector &values) const { - Assert (values.size()==1, ExcVectorHasWrongSize (values.size(), 1)); + Assert (values.size()==1, ExcDimensionMismatch (values.size(), 1)); double x = 1; @@ -55,7 +55,7 @@ class BoundaryValuesSine : public Function { vector &values, const unsigned int component) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; i::value (points[i], component); }; diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 65ed9b3826..3ca0f51ba7 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -3697,7 +3697,7 @@ class Coefficients { vector &values, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; iKink::value(points[i], 0); }; @@ -3730,7 +3730,7 @@ class Gradient : public Function { vector &values, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; iGradient::value(points[i], 0); }; @@ -3765,7 +3765,7 @@ class PreliminaryEarthModel : public Function { vector &values, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; iPreliminaryEarthModel::value(points[i], 0); }; @@ -3806,7 +3806,7 @@ class Distorted : public Function { vector &values, const unsigned int) const { Assert (values.size() == points.size(), - ExcVectorHasWrongSize(values.size(), points.size())); + ExcDimensionMismatch(values.size(), points.size())); for (unsigned int i=0; iDistorted::value(points[i], 0); };