// $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
const hp::QCollection<dim-1> &quadrature,
const typename FunctionMap<dim>::type &neumann_bc,
const std::vector<const InputVector *> &solutions,
- const std::vector<bool> &component_mask,
- const Function<dim> *coefficients,
+ const std::pair<const std::vector<bool>*,const Function<dim>*> &component_mask_and_coefficients,
const std::pair<unsigned int, unsigned int> this_thread,
typename FaceIntegrals<DH>::type &face_integrals,
PerThreadData &per_thread_data);
const hp::QCollection<dim-1> &quadrature,
const typename FunctionMap<dim>::type &neumann_bc,
const std::vector<const InputVector *> &solutions,
- const std::vector<bool> &component_mask,
- const Function<dim> *coefficients,
+ const std::pair<const std::vector<bool>*,const Function<dim>*> &component_mask_and_coefficients,
const std::pair<unsigned int, unsigned int> this_thread,
typename FaceIntegrals<DH>::type &face_integrals,
PerThreadData &per_thread_data)
{
+ const std::vector<bool> &component_mask = *component_mask_and_coefficients.first;
+ const Function<dim> *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();
const hp::QCollection<dim-1> &,
const typename FunctionMap<dim>::type &,
const std::vector<const InputVector *> &,
- const std::vector<bool> &,
- const Function<dim> *,
+ const std::pair<const std::vector<bool>*,const Function<dim>*> &,
const std::pair<unsigned int, unsigned int>,
typename FaceIntegrals<DH>::type &,
PerThreadData &)
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]);