From 6407d195e12517c5614f3786fe42734f68b1ef35 Mon Sep 17 00:00:00 2001 From: wolf Date: Thu, 15 Jul 1999 11:43:19 +0000 Subject: [PATCH] Change the old bit_vector to the standard C++ vector. git-svn-id: https://svn.dealii.org/trunk@1578 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_tools.h | 32 +++++++++++++++-------- deal.II/deal.II/source/dofs/dof_tools.cc | 33 ++++++++++++++---------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 0fd8cc3d31..08460bdbfa 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1,10 +1,15 @@ -// $Id$ +/*---------------------------- dof_tools.h ---------------------------*/ +/* $Id$ */ +#ifndef __dof_tools_H +#define __dof_tools_H +/*---------------------------- dof_tools.h ---------------------------*/ // Copyright Guido Kanschat, 1999 -#ifndef __deal_dof_tools_H -#define __deal_dof_tools_H -#include +#include + + + /** * Operations on DoF-numbers. @@ -33,19 +38,24 @@ class DoFTools * is not destroyed by this process. */ template - static void extract_dofs(const DoFHandler& dof, - const bit_vector& select, - bit_vector& selected_dofs); + static void extract_dofs(const DoFHandler &dof, + const vector &select, + vector &selected_dofs); /** * Same as #extract_dofs# for multi-level. */ template - static void extract_level_dofs(unsigned int level, - const MGDoFHandler& dof, - const bit_vector& select, - bit_vector& selected_dofs); + static void extract_level_dofs(const unsigned int level, + const MGDoFHandler &dof, + const vector &select, + vector &selected_dofs); }; + + +/*---------------------------- dof_tools.h ---------------------------*/ +/* end of #ifndef __dof_tools_H */ #endif +/*---------------------------- dof_tools.h ---------------------------*/ diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 391003e19a..4c53fa4b69 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -10,13 +10,15 @@ #include #include + + template void -DoFTools::extract_dofs(const DoFHandler& dof, - const bit_vector& local_select, - bit_vector& selected_dofs) +DoFTools::extract_dofs(const DoFHandler &dof, + const vector &local_select, + vector &selected_dofs) { - const FiniteElement& fe = dof.get_fe(); + const FiniteElement &fe = dof.get_fe(); Assert(local_select.size() == fe.n_components, ExcDimensionMismatch(local_select.size(), fe.n_components)); Assert(selected_dofs.size() == dof.n_dofs(), @@ -37,12 +39,14 @@ DoFTools::extract_dofs(const DoFHandler& dof, } } + + template void -DoFTools::extract_level_dofs(unsigned int level, - const MGDoFHandler& dof, - const bit_vector& local_select, - bit_vector& selected_dofs) +DoFTools::extract_level_dofs(const unsigned int level, + const MGDoFHandler &dof, + const vector &local_select, + vector &selected_dofs) { const FiniteElement& fe = dof.get_fe(); Assert(local_select.size() == fe.n_components, @@ -65,11 +69,14 @@ DoFTools::extract_level_dofs(unsigned int level, } } + + +// explicit instantiations template void DoFTools::extract_dofs(const DoFHandler& dof, - const bit_vector& local_select, - bit_vector& selected_dofs); + const vector& local_select, + vector& selected_dofs); template void DoFTools::extract_level_dofs(unsigned int level, const MGDoFHandler& dof, - const bit_vector& local_select, - bit_vector& selected_dofs); -//template DoFTools; + const vector& local_select, + vector& selected_dofs); + -- 2.39.5