From 6402a0afe7ea067f1c88c0ffcd9a7d3cfe750032 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 23 Jan 2015 07:41:43 -0600 Subject: [PATCH] Remove deprecated variants of DoFTools::make_periodicity_constraints(). --- doc/news/changes.h | 1 + include/deal.II/dofs/dof_tools.h | 51 ----------------------- source/dofs/dof_tools_constraints.cc | 46 +------------------- source/dofs/dof_tools_constraints.inst.in | 19 --------- 4 files changed, 3 insertions(+), 114 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index ae383178fe..857ee370b1 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -155,6 +155,7 @@ inconvenience this causes. - Mapping::transform_covariant and Mapping::transform_contravariant. - The typedef CompressedBlockSparsityPattern. - The deprecated constructors of SparsityPattern iterator classes. + - The deprecated variants of DoFTools::make_periodicity_constraints.
This release also removes the deprecated class MGDoFHandler. The functionality of this class had previously been incorporated into diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index 46aa59a682..686d50efb3 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -1055,57 +1055,6 @@ namespace DoFTools dealii::ConstraintMatrix &constraint_matrix, const ComponentMask &component_mask = ComponentMask()); - - - /** - * The @p offset is a vector tangential to the faces that is added to the - * location of vertices of the 'first' boundary when attempting to match - * them to the corresponding vertices of the 'second' boundary via - * orthogonal_equality (). This can be used to implement conditions such as - * $u(0,y)=u(1,y+1)$. - * - * @deprecated This function is deprecated. Use - * GridTools::collect_periodic_faces in conjunction with - * make_periodicity_constraints instead. - */ - template - void - make_periodicity_constraints - (const DH &dof_handler, - const types::boundary_id b_id1, - const types::boundary_id b_id2, - const int direction, - dealii::Tensor<1,DH::space_dimension> &offset, - dealii::ConstraintMatrix &constraint_matrix, - const ComponentMask &component_mask = ComponentMask()) DEAL_II_DEPRECATED; - - - /** - * The @p offset is a vector tangential to the faces that is added to the - * location of vertices of the 'first' boundary when attempting to match - * them to the corresponding vertices of the 'second' boundary via - * orthogonal_equality(). This can be used to implement conditions such as - * $u(0,y)=u(1,y+1)$. - * - * @note This version of make_periodicity_constraints will not work on - * meshes with cells not in - * @ref GlossFaceOrientation "standard orientation". - * - * @deprecated This function is deprecated. Use - * GridTools::collect_periodic_faces in conjunction with - * make_periodicity_constraints instead. - */ - template - void - make_periodicity_constraints - (const DH &dof_handler, - const types::boundary_id b_id, - const int direction, - dealii::Tensor<1,DH::space_dimension> &offset, - dealii::ConstraintMatrix &constraint_matrix, - const ComponentMask &component_mask = ComponentMask()) DEAL_II_DEPRECATED; - - /** * Take a vector of values which live on cells (e.g. an error per cell) and * distribute it to the dofs in such a way that a finite element field diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 860189a365..def686d5b4 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -2224,28 +2224,6 @@ namespace DoFTools const int direction, dealii::ConstraintMatrix &constraint_matrix, const ComponentMask &component_mask) - { - Tensor<1,DH::space_dimension> dummy; - make_periodicity_constraints (dof_handler, - b_id1, - b_id2, - direction, - dummy, - constraint_matrix, - component_mask); - } - - - - template - void - make_periodicity_constraints (const DH &dof_handler, - const types::boundary_id b_id1, - const types::boundary_id b_id2, - const int direction, - dealii::Tensor<1,DH::space_dimension> &offset, - dealii::ConstraintMatrix &constraint_matrix, - const ComponentMask &component_mask) { static const int space_dim = DH::space_dimension; Assert (0<=direction && direction (matched_faces, constraint_matrix, component_mask); @@ -2275,26 +2253,6 @@ namespace DoFTools const int direction, dealii::ConstraintMatrix &constraint_matrix, const ComponentMask &component_mask) - { - Tensor<1,DH::space_dimension> dummy; - make_periodicity_constraints (dof_handler, - b_id, - direction, - dummy, - constraint_matrix, - component_mask); - } - - - - template - void - make_periodicity_constraints (const DH &dof_handler, - const types::boundary_id b_id, - const int direction, - dealii::Tensor<1,DH::space_dimension> &offset, - dealii::ConstraintMatrix &constraint_matrix, - const ComponentMask &component_mask) { static const int dim = DH::dimension; static const int space_dim = DH::space_dimension; @@ -2310,7 +2268,7 @@ namespace DoFTools // Collect matching periodic cells on the coarsest level: GridTools::collect_periodic_faces(dof_handler, b_id, direction, - matched_faces, offset); + matched_faces); make_periodicity_constraints (matched_faces, constraint_matrix, component_mask); diff --git a/source/dofs/dof_tools_constraints.inst.in b/source/dofs/dof_tools_constraints.inst.in index 6e077c70c9..420155d5d2 100644 --- a/source/dofs/dof_tools_constraints.inst.in +++ b/source/dofs/dof_tools_constraints.inst.in @@ -51,30 +51,11 @@ for (DH : DOFHANDLERS; deal_II_dimension : DIMENSIONS) dealii::ConstraintMatrix &, const ComponentMask &); - template - void - DoFTools::make_periodicity_constraints(const DH &, - const types::boundary_id, - const types::boundary_id, - const int, - dealii::Tensor<1,DH::space_dimension> &, - dealii::ConstraintMatrix &, - const ComponentMask &); - - template - void - DoFTools::make_periodicity_constraints(const DH &, - const types::boundary_id, - const int, - dealii::ConstraintMatrix &, - const ComponentMask &); - template void DoFTools::make_periodicity_constraints(const DH &, const types::boundary_id, const int, - dealii::Tensor<1,DH::space_dimension> &, dealii::ConstraintMatrix &, const ComponentMask &); #endif -- 2.39.5