From: wolf Date: Tue, 4 May 1999 15:35:28 +0000 (+0000) Subject: Make one function static and change its name. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be8b6330be4ded9a00a1d14a78a81fed316ecb84;p=dealii-svn.git Make one function static and change its name. git-svn-id: https://svn.dealii.org/trunk@1266 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 26b768a808..7d56178f24 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -523,14 +523,14 @@ void PoissonProblem::run (ParameterHandler &prm) { h1_error.push_back (h1_error_per_cell.l2_norm()); cout << " Estimating H1 error... "; - KellyErrorEstimator ee; + QSimpson eq; - ee.estimate_error (*dof, eq, - KellyErrorEstimator::FunctionMap(), - solution, - estimated_error_per_cell, - ((prm.get("Test case")=="Kink") ? - &kink_coefficient : 0 )); + KellyErrorEstimator::estimate (*dof, eq, + KellyErrorEstimator::FunctionMap(), + solution, + estimated_error_per_cell, + ((prm.get("Test case")=="Kink") ? + &kink_coefficient : 0 )); cout << estimated_error_per_cell.l2_norm() << endl; estimated_error.push_back (estimated_error_per_cell.l2_norm()); diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index b188e0af5d..0d09f52c55 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -166,12 +166,12 @@ class KellyErrorEstimator { * value which denotes the constant * coefficient with value one. */ - static void estimate_error (const DoFHandler &dof, - const Quadrature &quadrature, - const FunctionMap &neumann_bc, - const Vector &solution, - Vector &error, - const Function *coefficient = 0); + static void estimate (const DoFHandler &dof, + const Quadrature &quadrature, + const FunctionMap &neumann_bc, + const Vector &solution, + Vector &error, + const Function *coefficient = 0); /** * Exception @@ -249,6 +249,7 @@ class KellyErrorEstimator { + /*---------------------------- error_estimator.h ---------------------------*/ /* end of #ifndef __error_estimator_H */ #endif diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 71406b231e..c72052848c 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -28,12 +28,12 @@ inline static double sqr (const double x) { #if deal_II_dimension == 1 template <> -void KellyErrorEstimator<1>::estimate_error (const DoFHandler<1> &, - const Quadrature<0> &, - const FunctionMap &, - const Vector &, - Vector &, - const Function<1> *) { +void KellyErrorEstimator<1>::estimate (const DoFHandler<1> &, + const Quadrature<0> &, + const FunctionMap &, + const Vector &, + Vector &, + const Function<1> *) { Assert(false, ExcNotImplemented()); }; @@ -41,12 +41,13 @@ void KellyErrorEstimator<1>::estimate_error (const DoFHandler<1> &, template -void KellyErrorEstimator::estimate_error (const DoFHandler &dof, - const Quadrature &quadrature, - const FunctionMap &neumann_bc, - const Vector &solution, - Vector &error, - const Function *coefficient) { +void KellyErrorEstimator::estimate (const DoFHandler &dof, + const Quadrature &quadrature, + const FunctionMap &neumann_bc, + const Vector &solution, + Vector &error, + const Function *coefficient) +{ Assert (neumann_bc.find(255) == neumann_bc.end(), ExcInvalidBoundaryIndicator()); diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 26b768a808..7d56178f24 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -523,14 +523,14 @@ void PoissonProblem::run (ParameterHandler &prm) { h1_error.push_back (h1_error_per_cell.l2_norm()); cout << " Estimating H1 error... "; - KellyErrorEstimator ee; + QSimpson eq; - ee.estimate_error (*dof, eq, - KellyErrorEstimator::FunctionMap(), - solution, - estimated_error_per_cell, - ((prm.get("Test case")=="Kink") ? - &kink_coefficient : 0 )); + KellyErrorEstimator::estimate (*dof, eq, + KellyErrorEstimator::FunctionMap(), + solution, + estimated_error_per_cell, + ((prm.get("Test case")=="Kink") ? + &kink_coefficient : 0 )); cout << estimated_error_per_cell.l2_norm() << endl; estimated_error.push_back (estimated_error_per_cell.l2_norm());