From: young Date: Tue, 3 Jun 2014 11:16:40 +0000 (+0000) Subject: Align function names for readablity. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72b693a5bc065a83db417a5e253ff6d5f05c680;p=dealii-svn.git Align function names for readablity. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@33010 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/numerics/error_estimator.cc b/deal.II/source/numerics/error_estimator.cc index 19fbf0c542..b368fc1567 100644 --- a/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/source/numerics/error_estimator.cc @@ -793,21 +793,21 @@ template template void KellyErrorEstimator:: -estimate (const Mapping &mapping, - const DH &dof_handler, - const Quadrature &quadrature, +estimate (const Mapping &mapping, + const DH &dof_handler, + const Quadrature &quadrature, const typename FunctionMap::type &neumann_bc, - const InputVector &solution, - Vector &error, - const ComponentMask &component_mask, - const Function *coefficients, - const unsigned int n_threads, - const types::subdomain_id subdomain_id, - const types::material_id material_id) + const InputVector &solution, + Vector &error, + const ComponentMask &component_mask, + const Function *coefficients, + const unsigned int n_threads, + const types::subdomain_id subdomain_id, + const types::material_id material_id) { // just pass on to the other function const std::vector solutions (1, &solution); - std::vector*> errors (1, &error); + std::vector*> errors (1, &error); estimate (mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -817,16 +817,16 @@ template template void KellyErrorEstimator:: -estimate (const DH &dof_handler, - const Quadrature &quadrature, +estimate (const DH &dof_handler, + const Quadrature &quadrature, const typename FunctionMap::type &neumann_bc, - const InputVector &solution, - Vector &error, - const ComponentMask &component_mask, - const Function *coefficients, - const unsigned int n_threads, - const types::subdomain_id subdomain_id, - const types::material_id material_id) + const InputVector &solution, + Vector &error, + const ComponentMask &component_mask, + const Function *coefficients, + const unsigned int n_threads, + const types::subdomain_id subdomain_id, + const types::material_id material_id) { estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, @@ -838,21 +838,21 @@ template template void KellyErrorEstimator:: -estimate (const Mapping &mapping, - const DH &dof_handler, - const hp::QCollection &quadrature, +estimate (const Mapping &mapping, + const DH &dof_handler, + const hp::QCollection &quadrature, const typename FunctionMap::type &neumann_bc, - const InputVector &solution, - Vector &error, - const ComponentMask &component_mask, - const Function *coefficients, - const unsigned int n_threads, - const types::subdomain_id subdomain_id, - const types::material_id material_id) + const InputVector &solution, + Vector &error, + const ComponentMask &component_mask, + const Function *coefficients, + const unsigned int n_threads, + const types::subdomain_id subdomain_id, + const types::material_id material_id) { // just pass on to the other function const std::vector solutions (1, &solution); - std::vector*> errors (1, &error); + std::vector*> errors (1, &error); estimate (mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -865,13 +865,13 @@ KellyErrorEstimator:: estimate (const DH &dof_handler, const hp::QCollection &quadrature, const typename FunctionMap::type &neumann_bc, - const InputVector &solution, - Vector &error, - const ComponentMask &component_mask, - const Function *coefficients, - const unsigned int n_threads, - const types::subdomain_id subdomain_id, - const types::material_id material_id) + const InputVector &solution, + Vector &error, + const ComponentMask &component_mask, + const Function *coefficients, + const unsigned int n_threads, + const types::subdomain_id subdomain_id, + const types::material_id material_id) { estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, @@ -885,17 +885,17 @@ template template void KellyErrorEstimator:: -estimate (const Mapping &mapping, - const DH &dof_handler, - const hp::QCollection &face_quadratures, +estimate (const Mapping &mapping, + const DH &dof_handler, + const hp::QCollection &face_quadratures, const typename FunctionMap::type &neumann_bc, - const std::vector &solutions, - std::vector*> &errors, - const ComponentMask &component_mask, - const Function *coefficients, - const unsigned int , - const types::subdomain_id subdomain_id_, - const types::material_id material_id) + const std::vector &solutions, + std::vector*> &errors, + const ComponentMask &component_mask, + const Function *coefficients, + const unsigned int , + const types::subdomain_id subdomain_id_, + const types::material_id material_id) { #ifdef DEAL_II_WITH_P4EST if (dynamic_cast*>