From ed26d32c948b964eb3f37bc5d72d020efef8d574 Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 17 Jun 2004 13:49:10 +0000 Subject: [PATCH] ENABLE_MULTIGRID removed git-svn-id: https://svn.dealii.org/trunk@9430 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_renumbering.cc | 6 ------ deal.II/deal.II/source/dofs/dof_tools.cc | 6 ------ deal.II/deal.II/source/grid/intergrid_map.cc | 6 +----- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 2699e99e87..50e4892435 100644 --- 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 #include -#ifdef ENABLE_MULTIGRID #include #include #include -#endif #include #include @@ -354,7 +352,6 @@ DoFRenumbering::compute_Cuthill_McKee ( } -#ifdef ENABLE_MULTIGRID template void DoFRenumbering::Cuthill_McKee ( MGDoFHandler &dof_handler, @@ -523,7 +520,6 @@ void DoFRenumbering::Cuthill_McKee ( // thus needs an own function dof_handler.renumber_dofs (level, new_indices); } -#endif template @@ -884,7 +880,6 @@ DoFRenumbering::compute_cell_wise_dg ( } -#ifdef ENABLE_MULTIGRID template void DoFRenumbering::cell_wise_dg ( MGDoFHandler& 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 ac99cd730c..f6217c9717 100644 --- 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 #include -#ifdef ENABLE_MULTIGRID #include #include -#endif #include #include @@ -1184,7 +1182,6 @@ DoFTools::extract_dofs (const DoFHandler &dof, } -#ifdef ENABLE_MULTIGRID template 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 const std::vector& component_select, std::vector& selected_dofs); -#ifdef ENABLE_MULTIGRID template void DoFTools::extract_level_dofs (const unsigned int level, const MGDoFHandler& dof, const std::vector& component_select, std::vector& 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 f9df892fd0..e8175a2827 100644 --- 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 #include -#ifdef ENABLE_MULTIGRID #include #include -#endif // helper function to aquire the number of levels within a grid template @@ -218,6 +216,4 @@ InterGridMap::memory_consumption () const template class InterGridMap; template class InterGridMap; -#ifdef ENABLE_MULTIGRID template class InterGridMap; -#endif -- 2.39.5