From dedd2bb2c307431373d3d5efa3f55a2c56408ee9 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 12 Apr 2011 02:51:19 +0000 Subject: [PATCH] Make it easier for the compiler to identify which function to call. git-svn-id: https://svn.dealii.org/trunk@23576 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/numerics/error_estimator.h | 32 ++++++------- deal.II/source/numerics/error_estimator.cc | 46 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/deal.II/include/deal.II/numerics/error_estimator.h b/deal.II/include/deal.II/numerics/error_estimator.h index f3860d25ec..9381a6bc95 100644 --- a/deal.II/include/deal.II/numerics/error_estimator.h +++ b/deal.II/include/deal.II/numerics/error_estimator.h @@ -329,11 +329,11 @@ class KellyErrorEstimator static void estimate (const Mapping &mapping, const DH &dof, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = numbers::invalid_unsigned_int, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -346,11 +346,11 @@ class KellyErrorEstimator template static void estimate (const DH &dof, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -386,11 +386,11 @@ class KellyErrorEstimator static void estimate (const Mapping &mapping, const DH &dof, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -403,11 +403,11 @@ class KellyErrorEstimator template static void estimate (const DH &dof, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -423,11 +423,11 @@ class KellyErrorEstimator static void estimate (const Mapping &mapping, const DH &dof, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -442,11 +442,11 @@ class KellyErrorEstimator template static void estimate (const DH &dof, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -462,11 +462,11 @@ class KellyErrorEstimator static void estimate (const Mapping &mapping, const DH &dof, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask = std::vector(), - const Function *coefficients = 0, + const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); @@ -481,11 +481,11 @@ class KellyErrorEstimator template static void estimate (const DH &dof, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask = std::vector(), - const Function*coefficients = 0, + const Function* coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id, const unsigned int material_id = numbers::invalid_unsigned_int); diff --git a/deal.II/source/numerics/error_estimator.cc b/deal.II/source/numerics/error_estimator.cc index d97bb1af50..534ede17c6 100644 --- a/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/source/numerics/error_estimator.cc @@ -238,9 +238,9 @@ namespace internal * the KellyErrorEstimator::estimate() * function. */ - const typename FunctionMap::type *neumann_bc; + const typename FunctionMap::type *neumann_bc; const std::vector component_mask; - const Function *coefficients; + const Function *coefficients; /** * Constructor. @@ -253,9 +253,9 @@ namespace internal const unsigned int n_solution_vectors, const types::subdomain_id_t subdomain_id, const unsigned int material_id, - const typename FunctionMap::type *neumann_bc, + const typename FunctionMap::type *neumann_bc, const std::vector component_mask, - const Function *coefficients); + const Function *coefficients); /** * Resize the arrays so that they fit the @@ -277,9 +277,9 @@ namespace internal const unsigned int n_solution_vectors, const types::subdomain_id_t subdomain_id, const unsigned int material_id, - const typename FunctionMap::type *neumann_bc, + const typename FunctionMap::type *neumann_bc, const std::vector component_mask, - const Function *coefficients) + const Function *coefficients) : finite_element (fe), face_quadratures (face_quadratures), @@ -1435,11 +1435,11 @@ KellyErrorEstimator:: estimate (const Mapping &mapping, const DH &dof_handler, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1458,11 +1458,11 @@ void KellyErrorEstimator:: estimate (const DH &dof_handler, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1481,11 +1481,11 @@ KellyErrorEstimator:: estimate (const Mapping &mapping, const DH &dof_handler, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1504,11 +1504,11 @@ void KellyErrorEstimator:: estimate (const DH &dof_handler, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const InputVector &solution, Vector &error, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1529,11 +1529,11 @@ KellyErrorEstimator:: estimate (const Mapping &mapping, const DH &dof_handler, const hp::QCollection &face_quadratures, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask_, - const Function *coefficients, + const Function *coefficients, const unsigned int , const types::subdomain_id_t subdomain_id_, const unsigned int material_id) @@ -1573,7 +1573,7 @@ estimate (const Mapping &mapping, Assert (solutions.size() == errors.size(), ExcIncompatibleNumberOfElements(solutions.size(), errors.size())); - for (typename FunctionMap::type::const_iterator i=neumann_bc.begin(); + for (typename FunctionMap::type::const_iterator i=neumann_bc.begin(); i!=neumann_bc.end(); ++i) Assert (i->second->n_components == n_components, ExcInvalidBoundaryFunction()); @@ -1706,11 +1706,11 @@ KellyErrorEstimator:: estimate (const Mapping &mapping, const DH &dof_handler, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1728,11 +1728,11 @@ template template void KellyErrorEstimator::estimate (const DH &dof_handler, const Quadrature &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) @@ -1749,11 +1749,11 @@ template template void KellyErrorEstimator::estimate (const DH &dof_handler, const hp::QCollection &quadrature, - const typename FunctionMap::type &neumann_bc, + const typename FunctionMap::type &neumann_bc, const std::vector &solutions, std::vector*> &errors, const std::vector &component_mask, - const Function *coefficients, + const Function *coefficients, const unsigned int n_threads, const types::subdomain_id_t subdomain_id, const unsigned int material_id) -- 2.39.5