From: Wolfgang Bangerth Date: Thu, 4 May 2017 22:13:21 +0000 (-0600) Subject: Remove deprecated version of GridTools::get_face_connectivity_of_cells(). X-Git-Tag: v9.0.0-rc1~1623^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101cf0da7db4d42b6a21fcaa0a4c1fe866c8af15;p=dealii.git Remove deprecated version of GridTools::get_face_connectivity_of_cells(). --- diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index c97c8c34c9..7b90b8672e 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -982,16 +982,6 @@ namespace GridTools get_face_connectivity_of_cells (const Triangulation &triangulation, DynamicSparsityPattern &connectivity); - /** - * As above, but filling a SparsityPattern object instead. - * - * @deprecated - */ - template - void - get_face_connectivity_of_cells (const Triangulation &triangulation, - SparsityPattern &connectivity) DEAL_II_DEPRECATED; - /** * Produce a sparsity pattern in which nonzero entries indicate that two * cells are connected via a common vertex. The diagonal entries of the diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 9c2a764e7a..d4e54d2de6 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -2291,18 +2291,6 @@ next_cell: - template - void - get_face_connectivity_of_cells (const Triangulation &triangulation, - SparsityPattern &cell_connectivity) - { - DynamicSparsityPattern dsp; - get_face_connectivity_of_cells(triangulation, dsp); - cell_connectivity.copy_from(dsp); - } - - - template void get_vertex_connectivity_of_cells (const Triangulation &triangulation, @@ -2384,11 +2372,13 @@ next_cell: // passing this graph off to METIS. // finally defer to the other function for // partitioning and assigning subdomain ids - SparsityPattern cell_connectivity; + DynamicSparsityPattern cell_connectivity; get_face_connectivity_of_cells (triangulation, cell_connectivity); + SparsityPattern sp_cell_connectivity; + sp_cell_connectivity.copy_from(cell_connectivity); partition_triangulation (n_partitions, - cell_connectivity, + sp_cell_connectivity, triangulation); } diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in index 4b5c9a308e..1b593ec313 100644 --- a/source/grid/grid_tools.inst.in +++ b/source/grid/grid_tools.inst.in @@ -177,11 +177,6 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS (const Triangulation &triangulation, DynamicSparsityPattern &cell_connectivity); - template - void get_face_connectivity_of_cells - (const Triangulation &triangulation, - SparsityPattern &cell_connectivity); - template void get_vertex_connectivity_of_cells (const Triangulation &triangulation,