ENABLE_MULTIGRID removed

git-svn-id: https://svn.dealii.org/trunk@9430 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc
index 2699e99e877f32e5aa3ceb1989e310f48a006338..50e489243560ea6c5727f758a12a569f27f0c062 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_renumbering.cc
+++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc
@@ -29,11 +29,9 @@
 #include <fe/fe.h>
 #include <dofs/dof_renumbering.h>
 
-#ifdef ENABLE_MULTIGRID
 #include <multigrid/mg_dof_handler.h>
 #include <multigrid/mg_dof_accessor.h>
 #include <multigrid/mg_dof_tools.h>
-#endif
 
 #include <vector>
 #include <map>
@@ -354,7 +352,6 @@ DoFRenumbering::compute_Cuthill_McKee (
 }
 
 
-#ifdef ENABLE_MULTIGRID
 template <int dim>
 void DoFRenumbering::Cuthill_McKee (
   MGDoFHandler<dim>               &dof_handler,
@@ -523,7 +520,6 @@ void DoFRenumbering::Cuthill_McKee (
                                   // thus needs an own function
   dof_handler.renumber_dofs (level, new_indices);
 }
-#endif
 
 
 template <int dim>
@@ -884,7 +880,6 @@ DoFRenumbering::compute_cell_wise_dg (
 }
 
 
-#ifdef ENABLE_MULTIGRID
 template <int dim>
 void DoFRenumbering::cell_wise_dg (
   MGDoFHandler<dim>& dof,
@@ -938,7 +933,6 @@ void DoFRenumbering::cell_wise_dg (
 
   dof.renumber_dofs(level, reverse);
 }
-#endif
 
 /**
  * Provide comparator for DoFCellAccessors

diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc
index ac99cd730c1a3430819f5d49a4f258b5b3304583..f6217c9717260e2d61e23bcf419b02888338c39c 100644 (file)
--- a/deal.II/deal.II/source/dofs/dof_tools.cc
+++ b/deal.II/deal.II/source/dofs/dof_tools.cc
@@ -29,10 +29,8 @@
 #include <lac/block_sparsity_pattern.h>
 #include <lac/vector.h>
 
-#ifdef ENABLE_MULTIGRID
 #include <multigrid/mg_dof_handler.h>
 #include <multigrid/mg_dof_accessor.h>
-#endif
 
 #include <algorithm>
 #include <numeric>
@@ -1184,7 +1182,6 @@ DoFTools::extract_dofs (const DoFHandler<dim>      &dof,
 }
 
 
-#ifdef ENABLE_MULTIGRID
 template<int dim>
 void
 DoFTools::extract_level_dofs(const unsigned int       level,
@@ -1280,7 +1277,6 @@ DoFTools::extract_level_dofs(const unsigned int       level,
         selected_dofs[indices[i]] = local_selected_dofs[i];
     }
 }
-#endif
 
 
 #if deal_II_dimension != 1
@@ -3046,13 +3042,11 @@ template void DoFTools::extract_dofs<deal_II_dimension>
  const std::vector<bool>& component_select,
  std::vector<bool>& selected_dofs);
 
-#ifdef ENABLE_MULTIGRID
 template void DoFTools::extract_level_dofs<deal_II_dimension>
 (const unsigned int level,
  const MGDoFHandler<deal_II_dimension>& dof,
  const std::vector<bool>& component_select,
  std::vector<bool>& selected_dofs);
-#endif
 
 #if deal_II_dimension != 1
 template

diff --git a/deal.II/deal.II/source/grid/intergrid_map.cc b/deal.II/deal.II/source/grid/intergrid_map.cc
index f9df892fd02c2e666c2449fc5774ace1e0ad07a3..e8175a282722098c016082b88eca3fd9d1934015 100644 (file)
--- a/deal.II/deal.II/source/grid/intergrid_map.cc
+++ b/deal.II/deal.II/source/grid/intergrid_map.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -22,10 +22,8 @@
 #include <grid/tria_iterator.h>
 #include <grid/intergrid_map.h>
 
-#ifdef ENABLE_MULTIGRID
 #include <multigrid/mg_dof_handler.h>
 #include <multigrid/mg_dof_accessor.h>
-#endif
 
 // helper function to aquire the number of levels within a grid
 template <class GridClass>
@@ -218,6 +216,4 @@ InterGridMap<GridClass,dim>::memory_consumption () const
 template class InterGridMap<Triangulation, deal_II_dimension>;
 template class InterGridMap<DoFHandler, deal_II_dimension>;
 
-#ifdef ENABLE_MULTIGRID
 template class InterGridMap<MGDoFHandler, deal_II_dimension>;
-#endif