From: bangerth Date: Mon, 13 Aug 2012 15:19:40 +0000 (+0000) Subject: Merge from upstream. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a5bf0fc9b942cb10a14b28dc2631e298535c3b;p=dealii-svn.git Merge from upstream. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25953 0785d39b-7218-0410-832d-ea1e28bc413d --- 12a5bf0fc9b942cb10a14b28dc2631e298535c3b diff --cc deal.II/contrib/boost-1.49.0/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp index 53306dabf9,53306dabf9..6abb033688 --- a/deal.II/contrib/boost-1.49.0/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp @@@ -18,4 -18,4 +18,4 @@@ #include #else #error "FUSION_MAX_VECTOR_SIZE out of bounds for preprocessed headers" --#endif ++#endif diff --cc deal.II/include/deal.II/multigrid/mg_tools.h index 7d75c6a062,b1695498e0..b9b2b94cd8 --- a/deal.II/include/deal.II/multigrid/mg_tools.h +++ b/deal.II/include/deal.II/multigrid/mg_tools.h @@@ -86,9 -86,9 +86,9 @@@ namespace MGTool * hanging nodes here, since only * one level is considered. */ -- template ++ template void -- make_sparsity_pattern (const MGDoFHandler &dof_handler, ++ make_sparsity_pattern (const DH &dof_handler, SparsityPattern &sparsity, const unsigned int level); diff --cc deal.II/source/multigrid/mg_tools.inst.in index b4d74691ff,b4d74691ff..0f78643c97 --- a/deal.II/source/multigrid/mg_tools.inst.in +++ b/deal.II/source/multigrid/mg_tools.inst.in @@@ -2,7 -2,7 +2,7 @@@ // $Id$ // Version: $Name$ // --// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors ++// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@@ -20,7 -20,7 +20,7 @@@ for (PATTERN : SPARSITY_PATTERNS; deal_ #if deal_II_dimension <= deal_II_space_dimension template void -- make_sparsity_pattern ( ++ make_sparsity_pattern ( const MGDoFHandler &, PATTERN &, const unsigned int); @@@ -77,13 -77,13 +77,13 @@@ for (deal_II_dimension : DIMENSIONS const Table<2,DoFTools::Coupling>&, const Table<2,DoFTools::Coupling>&); #endif -- template void count_dofs_per_component ( ++ template void count_dofs_per_component ( const MGDoFHandler&, std::vector >&, bool, std::vector); -- template void count_dofs_per_component ( ++ template void count_dofs_per_component ( const MGDoFHandler&, std::vector >&, std::vector); -- template void count_dofs_per_block ( ++ template void count_dofs_per_block ( const MGDoFHandler&, std::vector >&, std::vector); @@@ -116,13 -116,13 +116,13 @@@ std::vector > &non_interface_dofs); #if deal_II_dimension < 3 -- template void count_dofs_per_block ( ++ template void count_dofs_per_block ( const MGDoFHandler&, std::vector >&, std::vector); #endif #if deal_II_dimension == 3 -- template void count_dofs_per_block<1,3> ( ++ template void count_dofs_per_block ( const MGDoFHandler<1,3>&, std::vector >&, std::vector); #endif