]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from the branch on which this branch rests.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 21:06:57 +0000 (21:06 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 21:06:57 +0000 (21:06 +0000)
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
deal.II/source/multigrid/mg_tools.cc
deal.II/source/numerics/vector_tools.cc

index 1ccaed45c6684844cc5b0d3069d992a70e29972a..530c256cc14f43478cf4ff0d0a09fffa9b3cb7a3 100644 (file)
@@ -39,8 +39,10 @@ BlockInfo::initialize(const DoFHandler<dim, spacedim>& 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)
index a87cfb628ac06214e01f6f2fa180363b78fff1bd..d60d62e20a2d842314b3e6c619743b01cb128757 100644 (file)
@@ -1141,19 +1141,6 @@ namespace MGTools
 
 
 
-  template <>
-  void
-  make_boundary_list(
-    const DoFHandler<1,1>&,
-    const FunctionMap<1>::type&,
-    std::vector<std::set<unsigned int> >&,
-    const std::vector<bool>&)
-  {
-    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<std::set<unsigned int> >&,
-    const std::vector<bool>&)
-  {
-    Assert(false, ExcNotImplemented());
-  }
-
-
-
   template <int dim, int spacedim>
   void
   make_boundary_list(
index f2f7bb022fa5bf24ee6ac82b6fb74485548e88f6..c4a0be5f6fe8526bdbd9028b3c8f6c7c2abf2291 100644 (file)
@@ -14,7 +14,7 @@
 #include <deal.II/dofs/dof_handler.h>
 #include <deal.II/hp/dof_handler.h>
 
-#include <deal.II/numerics/vectors.templates.h>
+#include <deal.II/numerics/vector_tools.templates.h>
 
 DEAL_II_NAMESPACE_OPEN
 

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.