From: Timo Heister Date: Thu, 4 Aug 2016 20:01:16 +0000 (+0200) Subject: fix make_cell_patches X-Git-Tag: v8.5.0-rc1~802^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2919%2Fhead;p=dealii.git fix make_cell_patches - fix instantiation to match declaration - remove spacedim default value - instantiate also for codim --- diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index b599fe4f35..ef07a09839 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -1718,12 +1718,12 @@ namespace DoFTools * into the block list which are selected. This allows for instance * the exclusion of components or of dofs on the boundary. */ - template + template void make_cell_patches(SparsityPattern &block_list, const DoFHandler &dof_handler, const unsigned int level, const std::vector &selected_dofs = std::vector(), - types::global_dof_index offset = 0); + const types::global_dof_index offset = 0); /** * Create an incidence matrix that for every vertex on a given level of a diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index b71591635c..bb1b516de4 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -2055,15 +2055,15 @@ namespace DoFTools - template - void make_cell_patches(SparsityPattern &block_list, - const DoFHandlerType &dof_handler, - const unsigned int level, - const std::vector &selected_dofs, - types::global_dof_index offset) + template + void make_cell_patches(SparsityPattern &block_list, + const DoFHandler &dof_handler, + const unsigned int level, + const std::vector &selected_dofs, + const types::global_dof_index offset) { - typename DoFHandlerType::level_cell_iterator cell; - typename DoFHandlerType::level_cell_iterator endc = dof_handler.end(level); + typename DoFHandler::level_cell_iterator cell; + typename DoFHandler::level_cell_iterator endc = dof_handler.end(level); std::vector indices; unsigned int i=0; diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in index 236ba18697..2fca0bb11e 100644 --- a/source/dofs/dof_tools.inst.in +++ b/source/dofs/dof_tools.inst.in @@ -33,10 +33,6 @@ for (deal_II_dimension : DIMENSIONS) IndexSet & dof_set); #endif - template void - DoFTools::make_cell_patches > - (SparsityPattern&, const DoFHandler&, const unsigned int, const std::vector&, types::global_dof_index); - template std::vector DoFTools::make_vertex_patches (SparsityPattern&, const DoFHandler&, @@ -836,6 +832,14 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) const BlockMask &, std::vector&); + template + void + make_cell_patches + (SparsityPattern&, + const DoFHandler&, + const unsigned int, const std::vector&, + const types::global_dof_index); + \} #endif }