]> https://gitweb.dealii.org/ - dealii.git/commitdiff
redundant exceptions removed
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 25 May 2000 15:52:03 +0000 (15:52 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 25 May 2000 15:52:03 +0000 (15:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@2944 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/function.h
deal.II/base/source/function.cc
deal.II/base/source/function_lib.cc
deal.II/base/source/tensor_function.cc
deal.II/configure.in
tests/big-tests/multigrid/multigrid.cc
tests/big-tests/poisson/problem.cc
tests/deal.II/wave-test-3.cc

index 27a8884506bccb50e0c2975c5a12f7462cdc932b..5b44c49f2d9648e3ee834f7f9ca5bfebc7236002 100644 (file)
@@ -255,25 +255,6 @@ class Function : public FunctionTime,
                                      */
     virtual void vector_laplacian_list (const vector<Point<dim> > &points,
                                        vector<Vector<double> >   &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.");
 };
 
 
index 244b0c6d1fd501a9d0cfb1615eceefe2955f83b2..7ce1f9fa73f07a6139bf279582af1265a6ea0639 100644 (file)
@@ -57,7 +57,7 @@ void Function<dim>::value_list (const vector<Point<dim> > &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; i<points.size(); ++i)
     values[i]  = this->value (points[i], component);
@@ -72,7 +72,7 @@ void Function<dim>::vector_value_list (const vector<Point<dim> > &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; i<points.size(); ++i)
     this->vector_value (points[i], values[i]);
@@ -102,7 +102,7 @@ void Function<dim>::gradient_list (const vector<Point<dim> > &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<points.size(); ++i)
     gradients[i] = gradient(points[i], component);
@@ -114,12 +114,12 @@ void Function<dim>::vector_gradient_list (const vector<Point<dim> >       &point
                                          vector<vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
-         ExcVectorHasWrongSize(gradients.size(), points.size()));
+         ExcDimensionMismatch(gradients.size(), points.size()));
 
   for (unsigned int i=0; i<points.size(); ++i)
     {
       Assert (gradients[i].size() == n_components,
-             ExcVectorHasWrongSize(gradients[i].size(), n_components));
+             ExcDimensionMismatch(gradients[i].size(), n_components));
       for (unsigned int component=0; component<n_components; ++component)
        gradients[i][component] = gradient(points[i], component);
     };
@@ -149,7 +149,7 @@ void ZeroFunction<dim>::vector_value (const Point<dim> &,
                                      Vector<double>   &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<dim>::value_list (const vector<Point<dim> > &points,
                                    vector<double>            &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<dim>::vector_value_list (const vector<Point<dim> > &points,
                                           vector<Vector<double> >   &values) const
 {
   Assert (values.size() == points.size(),
-         ExcVectorHasWrongSize(values.size(), points.size()));
+         ExcDimensionMismatch(values.size(), points.size()));
 
   for (unsigned int i=0; i<points.size(); ++i)
     {
       Assert (values[i].size() == n_components,
-             ExcVectorHasWrongSize(values[i].size(), n_components));
+             ExcDimensionMismatch(values[i].size(), n_components));
       fill_n (values[i].begin(), n_components, 0.);
     };
 };
@@ -195,7 +195,7 @@ void ZeroFunction<dim>::vector_gradient (const Point<dim>       &,
                                         vector<Tensor<1,dim> > &gradients) const
 {
   Assert (gradients.size() == n_components,
-         ExcVectorHasWrongSize(gradients.size(), n_components));
+         ExcDimensionMismatch(gradients.size(), n_components));
 
   for (unsigned int c=0; c<n_components; ++c)
     gradients[c].clear ();
@@ -208,7 +208,7 @@ void ZeroFunction<dim>::gradient_list (const vector<Point<dim> > &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<points.size(); ++i)
     gradients[i].clear ();
@@ -220,11 +220,11 @@ void ZeroFunction<dim>::vector_gradient_list (const vector<Point<dim> >       &p
                                              vector<vector<Tensor<1,dim> > > &gradients) const
 {
   Assert (gradients.size() == points.size(),
-         ExcVectorHasWrongSize(gradients.size(), points.size()));
+         ExcDimensionMismatch(gradients.size(), points.size()));
   for (unsigned int i=0; i<points.size(); ++i)
     {
       Assert (gradients[i].size() == n_components,
-             ExcVectorHasWrongSize(gradients[i].size(), n_components));
+             ExcDimensionMismatch(gradients[i].size(), n_components));
       for (unsigned int c=0; c<n_components; ++c)
        gradients[i][c].clear ();
     };
@@ -255,7 +255,7 @@ void ConstantFunction<dim>::vector_value (const Point<dim> &,
                                          Vector<double>   &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<dim>::value_list (const vector<Point<dim> > &points,
                                        vector<double>            &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<dim>::vector_value_list (const vector<Point<dim> > &points
                                               vector<Vector<double> >   &values) const
 {
   Assert (values.size() == points.size(),
-         ExcVectorHasWrongSize(values.size(), points.size()));
+         ExcDimensionMismatch(values.size(), points.size()));
 
   for (unsigned int i=0; i<points.size(); ++i)
     {
       Assert (values[i].size() == n_components,
-             ExcVectorHasWrongSize(values[i].size(), n_components));
+             ExcDimensionMismatch(values[i].size(), n_components));
       fill_n (values[i].begin(), n_components, function_value);
     };
 };
@@ -314,7 +314,7 @@ void Function<dim>::laplacian_list (const vector<Point<dim> > &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; i<points.size(); ++i)
     laplacians[i]  = this->laplacian (points[i], component);
@@ -329,7 +329,7 @@ void Function<dim>::vector_laplacian_list (const vector<Point<dim> > &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; i<points.size(); ++i)
     this->vector_laplacian (points[i], laplacians[i]);
index 285335921ab6d5044437ef46caee64997766b959..13d8225c682c1b882dd371bbd392e66e2b026802 100644 (file)
@@ -43,7 +43,7 @@ PillowFunction<dim>::value_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -93,7 +93,7 @@ PillowFunction<dim>::laplacian_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -150,7 +150,7 @@ PillowFunction<dim>::gradient_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -203,7 +203,7 @@ CosineFunction<dim>::value_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -251,7 +251,7 @@ CosineFunction<dim>::laplacian_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -306,7 +306,7 @@ CosineFunction<dim>::gradient_list (const vector<Point<dim> > &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.size();++i)
     {
@@ -357,7 +357,7 @@ LSingularityFunction::value_list (const vector<Point<2> > &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.size();++i)
     {
@@ -391,7 +391,7 @@ LSingularityFunction::laplacian_list (const vector<Point<2> > &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.size();++i)
     values[i] = 0.;
@@ -428,7 +428,7 @@ LSingularityFunction::gradient_list (const vector<Point<2> > &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<Point<2> > &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.size();++i)
     {
@@ -484,7 +484,7 @@ SlitSingularityFunction::laplacian_list (const vector<Point<2> > &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.size();++i)
     values[i] = 0.;
@@ -508,7 +508,7 @@ SlitSingularityFunction::gradient_list (const vector<Point<2> > &points,
                                    const unsigned int) const
 {
   Assert (gradients.size() == points.size(),
-         ExcVectorHasWrongSize(gradients.size(), points.size()));
+         ExcDimensionMismatch(gradients.size(), points.size()));
   Assert(false, ExcNotImplemented());
 }
 
index a625d9b79fcef1daf461c3d51ece4b2acf507b4f..b19ef8f130bbaf10f523524edef9a86b82bf4566 100644 (file)
@@ -50,7 +50,7 @@ TensorFunction<rank, dim>::value_list (const vector<Point<dim> > &points,
                                       vector<Tensor<rank,dim> > &values) const
 {
   Assert (values.size() == points.size(),
-         ExcVectorHasWrongSize(values.size(), points.size()));
+         ExcDimensionMismatch(values.size(), points.size()));
 
   for (unsigned int i=0; i<points.size(); ++i)
     values[i]  = this->value (points[i]);
@@ -72,7 +72,7 @@ TensorFunction<rank, dim>::gradient_list (const vector<Point<dim> > &points,
                                    vector<Tensor<rank+1,dim> > &gradients) const
 {
   Assert (gradients.size() == points.size(),
-         ExcVectorHasWrongSize(gradients.size(), points.size()));
+         ExcDimensionMismatch(gradients.size(), points.size()));
 
   for (unsigned int i=0; i<points.size(); ++i)
     gradients[i] = gradient(points[i]);
index 5a91b1e88aab1d24d354aa8df8777ff5f52b2953..f745f8979679312d6fdf1ead629aaffa7b53a16e 100644 (file)
@@ -136,6 +136,7 @@ AC_ARG_ENABLE(multigrid,
     fi)
 if test $enablemultigrid = yes ; then
    AC_MSG_RESULT(Configuring multigrid)
+   AC_DEFINE(ENABLE_MULTIGRID)
 fi
 AC_SUBST(enablemultigrid)
 
index efe706d6825cead686881b3fd99939246f512f27..2782a285c8ffaa3f2db4b4b9d027ec9c03dc4ffd 100644 (file)
@@ -110,10 +110,10 @@ void Coefficient<dim>::value_list (const vector<Point<dim> > &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<n_points; ++i)
     {
index b5de827b164280ec1ef8ee82627604952bccbb35..5135bb111b18494af36d8644022e5ba79aa0fe2b 100644 (file)
@@ -34,7 +34,7 @@ class BoundaryValuesSine : public Function<dim> {
                                      */
     virtual void value (const Point<dim> &p,
                        Vector<double>   &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<dim> {
                             vector<double>            &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<points.size(); ++i) 
        values[i] = BoundaryValuesSine<dim>::value (points[i], component);
     };
index 65ed9b3826024d427c37134f5038c72e7d543364..3ca0f51ba76a3870a856bf3ed2db69d191ec09d8 100644 (file)
@@ -3697,7 +3697,7 @@ class Coefficients {
                                 vector<double>            &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; i<points.size(); ++i)
            values[i]  = this->Kink::value(points[i], 0);
        };
@@ -3730,7 +3730,7 @@ class Gradient : public Function<dim> {
                                 vector<double>            &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; i<points.size(); ++i)
            values[i]  = this->Gradient::value(points[i], 0);
        };
@@ -3765,7 +3765,7 @@ class PreliminaryEarthModel : public Function<dim> {
                                 vector<double>            &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; i<points.size(); ++i)
            values[i]  = this->PreliminaryEarthModel::value(points[i], 0);
        };
@@ -3806,7 +3806,7 @@ class Distorted : public Function<dim> {
                                 vector<double>            &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; i<points.size(); ++i)
            values[i]  = this->Distorted::value(points[i], 0);
        };

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.