]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from upstream.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 15:19:40 +0000 (15:19 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 15:19:40 +0000 (15:19 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25953 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/contrib/boost-1.49.0/include/boost/fusion/tuple/detail/preprocessed/make_tuple.hpp
deal.II/include/deal.II/multigrid/mg_tools.h
deal.II/source/multigrid/mg_tools.inst.in

index 53306dabf9d10fa5db9f02ca4e3f924dfc2535f2,53306dabf9d10fa5db9f02ca4e3f924dfc2535f2..6abb033688932c4e083586f6963634a2d2e81930
@@@ -18,4 -18,4 +18,4 @@@
  #include <boost/fusion/tuple/detail/preprocessed/make_tuple50.hpp>
  #else
  #error "FUSION_MAX_VECTOR_SIZE out of bounds for preprocessed headers"
--#endif
++#endif
index 7d75c6a062a959872c7869ab9a5ee4fb80eba5af,b1695498e03c2be1bb9de910d6045bcb3e415a0b..b9b2b94cd8e9b79512d83cadab37e30638f97372
@@@ -86,9 -86,9 +86,9 @@@ namespace MGTool
                                      * hanging nodes here, since only
                                      * one level is considered.
                                      */
--  template <int dim, class SparsityPattern, int spacedim>
++  template <class DH, class SparsityPattern>
    void
--  make_sparsity_pattern (const MGDoFHandler<dim,spacedim> &dof_handler,
++  make_sparsity_pattern (const DH &dof_handler,
                           SparsityPattern         &sparsity,
                           const unsigned int       level);
  
index b4d74691ffdbdb655ff97181be452cc7819c9659,b4d74691ffdbdb655ff97181be452cc7819c9659..0f78643c9768b7b93348afc683fc47fe8b416709
@@@ -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<deal_II_dimension, PATTERN, deal_II_space_dimension> (
++      make_sparsity_pattern (
          const MGDoFHandler<deal_II_dimension, deal_II_space_dimension> &,
          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<deal_II_dimension> (
++      template void count_dofs_per_component (
        const MGDoFHandler<deal_II_dimension>&, std::vector<std::vector<unsigned int> >&,
        bool, std::vector<unsigned int>);
--      template void count_dofs_per_component<deal_II_dimension> (
++      template void count_dofs_per_component (
        const MGDoFHandler<deal_II_dimension>&, std::vector<std::vector<unsigned int> >&,
        std::vector<unsigned int>);
--      template void count_dofs_per_block<deal_II_dimension> (
++      template void count_dofs_per_block (
        const MGDoFHandler<deal_II_dimension>&, std::vector<std::vector<unsigned int> >&,
        std::vector<unsigned int>);
  
                                      std::vector<std::set<unsigned int> > &non_interface_dofs);
  
  #if deal_II_dimension < 3
--      template void count_dofs_per_block<deal_II_dimension,deal_II_dimension+1> (
++      template void count_dofs_per_block (
        const MGDoFHandler<deal_II_dimension,deal_II_dimension+1>&,
        std::vector<std::vector<unsigned int> >&, std::vector<unsigned int>);
  #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<unsigned int> >&, std::vector<unsigned int>);
  #endif

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.