From: bangerth Date: Mon, 31 Dec 2012 23:15:23 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=278fcc8adad1ebd79bdc582aebc38631b7757b69;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27890 0785d39b-7218-0410-832d-ea1e28bc413d --- 278fcc8adad1ebd79bdc582aebc38631b7757b69 diff --cc deal.II/include/deal.II/matrix_free/mapping_info.h index bfd47e83c0,481fe26814..4eb7cab711 --- a/deal.II/include/deal.II/matrix_free/mapping_info.h +++ b/deal.II/include/deal.II/matrix_free/mapping_info.h @@@ -88,11 -79,10 +79,10 @@@ namespace interna */ UpdateFlags compute_update_flags (const UpdateFlags update_flags, - const std::vector > &quad) const; + const std::vector > &quad) const; /** - * Returns the type of a given cell as - * detected during initialization. + * Returns the type of a given cell as detected during initialization. */ CellType get_cell_type (const unsigned int cell_chunk_no) const; diff --cc deal.II/include/deal.II/matrix_free/mapping_info.templates.h index 1820dfd9c9,647ed1476c..871a2838fc --- a/deal.II/include/deal.II/matrix_free/mapping_info.templates.h +++ b/deal.II/include/deal.II/matrix_free/mapping_info.templates.h @@@ -908,11 -862,9 +862,9 @@@ end_set (STREAM &out, const SizeInfo &size_info) const { - // print_memory_statistics involves - // global communication, so we can - // disable the check here only if no - // processor has any such data + // print_memory_statistics involves global communication, so we can + // disable the check here only if no processor has any such data -#if DEAL_II_COMPILER_SUPPORTS_MPI +#ifdef DEAL_II_COMPILER_SUPPORTS_MPI unsigned int general_size_glob = 0, general_size_loc = jacobians.size(); MPI_Allreduce (&general_size_loc, &general_size_glob, 1, MPI_UNSIGNED, MPI_MAX, size_info.communicator); diff --cc deal.II/include/deal.II/matrix_free/matrix_free.h index 5c047f81f0,97b71f0425..0c45c7d85d --- a/deal.II/include/deal.II/matrix_free/matrix_free.h +++ b/deal.II/include/deal.II/matrix_free/matrix_free.h @@@ -2117,10 -1864,9 +1864,9 @@@ namespace interna } -#if DEAL_II_USE_MT==1 +#ifdef DEAL_II_USE_MT - // This defines the TBB data structures that - // are needed to schedule the + // This defines the TBB data structures that are needed to schedule the // partition-partition variant namespace partition @@@ -2386,18 -2132,16 +2132,16 @@@ MatrixFree::cell_loo const std::pair &)> &cell_operation, OutVector &dst, - const InVector &src) const + const InVector &src) const { -#if DEAL_II_USE_MT==1 +#ifdef DEAL_II_USE_MT - // Use multithreading if so requested and if - // there is enough work to do in parallel (the - // code might hang if there are less than two - // chunks!) + // Use multithreading if so requested and if there is enough work to do in + // parallel (the code might hang if there are less than two chunks!) if (task_info.use_multithreading == true && task_info.n_blocks > 3) { - // to simplify the function calls, bind away - // all arguments except the cell range + // to simplify the function calls, bind away all arguments except the + // cell range typedef std_cxx1x::function &range)> Worker; diff --cc deal.II/include/deal.II/matrix_free/matrix_free.templates.h index 97f35dcb2e,7315162db3..261a4db783 --- a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h +++ b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h @@@ -136,10 -136,9 +136,9 @@@ internal_reinit(const Mapping