From 671bfaee8f929d1e7dc33627009af1d51b99176c Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 9 Aug 2012 21:06:57 +0000 Subject: [PATCH] Merge from the branch on which this branch rests. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25846 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/dofs/block_info.cc | 6 ++++-- deal.II/source/multigrid/mg_tools.cc | 26 ------------------------- deal.II/source/numerics/vector_tools.cc | 2 +- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/deal.II/source/dofs/block_info.cc b/deal.II/source/dofs/block_info.cc index 1ccaed45c6..530c256cc1 100644 --- a/deal.II/source/dofs/block_info.cc +++ b/deal.II/source/dofs/block_info.cc @@ -39,8 +39,10 @@ BlockInfo::initialize(const DoFHandler& dof, bool levels_only, bo for (unsigned int i = 0; i < sizes.size (); ++i) sizes[i].resize (dof.get_fe ().n_blocks ()); - - MGTools::count_dofs_per_block (dof, sizes); + +//TODO[MB]: + Assert (false, ExcMessage("Markus: This still needs to be fixed, it doesn't compile.")); +// MGTools::count_dofs_per_block (dof, sizes); levels.resize (sizes.size ()); for (unsigned int i = 0; i < sizes.size (); ++i) diff --git a/deal.II/source/multigrid/mg_tools.cc b/deal.II/source/multigrid/mg_tools.cc index a87cfb628a..d60d62e20a 100644 --- a/deal.II/source/multigrid/mg_tools.cc +++ b/deal.II/source/multigrid/mg_tools.cc @@ -1141,19 +1141,6 @@ namespace MGTools - template <> - void - make_boundary_list( - const DoFHandler<1,1>&, - const FunctionMap<1>::type&, - std::vector >&, - const std::vector&) - { - Assert(false, ExcNotImplemented()); - } - - - template <> void make_boundary_list( @@ -1167,19 +1154,6 @@ namespace MGTools - template <> - void - make_boundary_list( - const DoFHandler<1,2>&, - const FunctionMap<1>::type&, - std::vector >&, - const std::vector&) - { - Assert(false, ExcNotImplemented()); - } - - - template void make_boundary_list( diff --git a/deal.II/source/numerics/vector_tools.cc b/deal.II/source/numerics/vector_tools.cc index f2f7bb022f..c4a0be5f6f 100644 --- a/deal.II/source/numerics/vector_tools.cc +++ b/deal.II/source/numerics/vector_tools.cc @@ -14,7 +14,7 @@ #include #include -#include +#include DEAL_II_NAMESPACE_OPEN -- 2.39.5