From: leicht Date: Tue, 1 Apr 2008 14:57:55 +0000 (+0000) Subject: Templatize DoFRenumbering::subdomain_wise and corresponding compute_* function on... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dd4d17f4ceb28abb9e644cbbeb78aaf1ac04ed2;p=dealii-svn.git Templatize DoFRenumbering::subdomain_wise and corresponding compute_* function on dof handler type instead of dimension. Instantiate for standard and hp DoFHandler. git-svn-id: https://svn.dealii.org/trunk@15979 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_renumbering.h b/deal.II/deal.II/include/dofs/dof_renumbering.h index a85a2bd144..522ab8e3cc 100644 --- a/deal.II/deal.II/include/dofs/dof_renumbering.h +++ b/deal.II/deal.II/include/dofs/dof_renumbering.h @@ -1115,9 +1115,9 @@ namespace DoFRenumbering * will be in this order also after * reordering. */ - template + template void - subdomain_wise (DoFHandler &dof_handler); + subdomain_wise (DH &dof_handler); /** * Computes the renumbering @@ -1128,10 +1128,10 @@ namespace DoFRenumbering * DoFHandler dofs but returns * the renumbering vector. */ - template + template void compute_subdomain_wise (std::vector &new_dof_indices, - const DoFHandler &dof_handler); + const DH &dof_handler); /** * Exception diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index b38a596eab..e53a2b9f5b 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -1791,12 +1791,12 @@ namespace DoFRenumbering - template + template void - subdomain_wise (DoFHandler &dof_handler) + subdomain_wise (DH &dof_handler) { std::vector renumbering(dof_handler.n_dofs(), - DoFHandler::invalid_dof_index); + DH::invalid_dof_index); compute_subdomain_wise(renumbering, dof_handler); dof_handler.renumber_dofs(renumbering); @@ -1804,10 +1804,10 @@ namespace DoFRenumbering - template + template void compute_subdomain_wise (std::vector &new_dof_indices, - const DoFHandler &dof_handler) + const DH &dof_handler) { const unsigned int n_dofs = dof_handler.n_dofs(); Assert (new_dof_indices.size() == n_dofs, @@ -2142,14 +2142,12 @@ namespace DoFRenumbering const std::vector &); template - void subdomain_wise + void subdomain_wise > (DoFHandler &); template - void - compute_subdomain_wise - (std::vector&, - const DoFHandler &); + void subdomain_wise > + (hp::DoFHandler &); template void Cuthill_McKee