From 7be47f390fe7889ed244bafcf9c4348028daf6c0 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 10 Oct 2008 23:32:01 +0000 Subject: [PATCH] Reduce the number of arguments of a helper function from 10 to 9 to make it work with the new and upcoming threading framework. git-svn-id: https://svn.dealii.org/trunk@17177 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/error_estimator.h | 5 ++--- deal.II/deal.II/source/numerics/error_estimator.cc | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index f2f342ff57..ad66e67c75 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -699,8 +699,7 @@ class KellyErrorEstimator const hp::QCollection &quadrature, const typename FunctionMap::type &neumann_bc, const std::vector &solutions, - const std::vector &component_mask, - const Function *coefficients, + const std::pair*,const Function*> &component_mask_and_coefficients, const std::pair this_thread, typename FaceIntegrals::type &face_integrals, PerThreadData &per_thread_data); diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 4abda8a0d8..5e35be9482 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -643,12 +643,14 @@ estimate_some (const hp::MappingCollection &mapping, const hp::QCollection &quadrature, const typename FunctionMap::type &neumann_bc, const std::vector &solutions, - const std::vector &component_mask, - const Function *coefficients, + const std::pair*,const Function*> &component_mask_and_coefficients, const std::pair this_thread, typename FaceIntegrals::type &face_integrals, PerThreadData &per_thread_data) { + const std::vector &component_mask = *component_mask_and_coefficients.first; + const Function *coefficients = component_mask_and_coefficients.second; + const unsigned int n_solution_vectors = solutions.size(); const unsigned int n_components = dof_handler.get_fe().n_components(); @@ -1020,8 +1022,7 @@ estimate (const Mapping &mapping, const hp::QCollection &, const typename FunctionMap::type &, const std::vector &, - const std::vector &, - const Function *, + const std::pair*,const Function*> &, const std::pair, typename FaceIntegrals::type &, PerThreadData &) @@ -1034,7 +1035,7 @@ estimate (const Mapping &mapping, threads += Threads::spawn (estimate_some_ptr) (mapping_collection, dof_handler, face_quadratures, neumann_bc, solutions, - component_mask, coefficients, + std::make_pair(&component_mask, coefficients), std::make_pair(i, n_threads), face_integrals, *data_structures[i]); -- 2.39.5