From 98d8920059c3a7816ba2e406afc2e9a06b65c018 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 9 Jun 2020 08:55:08 -0400 Subject: [PATCH] Remove ConstraintMatrix reference --- include/deal.II/lac/affine_constraints.h | 13 ------------- tests/ad_common_tests/step-44-helper_scalar_01.h | 4 ++-- tests/ad_common_tests/step-44-helper_vector_01.h | 4 ++-- tests/adolc/step-44.cc | 4 ++-- tests/numerics/project_bv_curl_conf_03.cc | 4 ++-- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h index 79a37a350f..fa51895567 100644 --- a/include/deal.II/lac/affine_constraints.h +++ b/include/deal.II/lac/affine_constraints.h @@ -419,19 +419,6 @@ template class AffineConstraints; #endif -/** - * ConstraintMatrix has been renamed to AffineConstraints. Provide a - * compatibility alias that defaults to AffineConstraints. - * - * @deprecated Use AffineConstraints instead of ConstraintMatrix - */ -using ConstraintMatrix DEAL_II_DEPRECATED = AffineConstraints; -// Note: Unfortunately, we cannot move this compatibility alias into -// constraint_matrix.h directly. This would break a lot of user projects -// that include constraint_matrix.h transitively due to various deal.II -// headers that include the file. - - // TODO[WB]: We should have a function of the kind // AffineConstraints::add_constraint (const size_type constrained_dof, // const std::vector > &entries, diff --git a/tests/ad_common_tests/step-44-helper_scalar_01.h b/tests/ad_common_tests/step-44-helper_scalar_01.h index c45248e11b..e8f1ac25f3 100644 --- a/tests/ad_common_tests/step-44-helper_scalar_01.h +++ b/tests/ad_common_tests/step-44-helper_scalar_01.h @@ -874,7 +874,7 @@ namespace Step44 const QGauss qf_face; const unsigned int n_q_points; const unsigned int n_q_points_f; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -966,7 +966,7 @@ namespace Step44 make_grid(); system_setup(); { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const ComponentSelectFunction J_mask(J_component, n_components); VectorTools::project(dof_handler_ref, diff --git a/tests/ad_common_tests/step-44-helper_vector_01.h b/tests/ad_common_tests/step-44-helper_vector_01.h index 4a8d13570f..72cd94e899 100644 --- a/tests/ad_common_tests/step-44-helper_vector_01.h +++ b/tests/ad_common_tests/step-44-helper_vector_01.h @@ -597,7 +597,7 @@ namespace Step44 const QGauss qf_face; const unsigned int n_q_points; const unsigned int n_q_points_f; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -687,7 +687,7 @@ namespace Step44 make_grid(); system_setup(); { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const ComponentSelectFunction J_mask(J_component, n_components); VectorTools::project(dof_handler_ref, diff --git a/tests/adolc/step-44.cc b/tests/adolc/step-44.cc index 6f2f19fcd7..cd70429a42 100644 --- a/tests/adolc/step-44.cc +++ b/tests/adolc/step-44.cc @@ -709,7 +709,7 @@ namespace Step44 const QGauss qf_face; const unsigned int n_q_points; const unsigned int n_q_points_f; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -801,7 +801,7 @@ namespace Step44 make_grid(); system_setup(); { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const ComponentSelectFunction J_mask(J_component, n_components); VectorTools::project(dof_handler_ref, diff --git a/tests/numerics/project_bv_curl_conf_03.cc b/tests/numerics/project_bv_curl_conf_03.cc index 307c5da8fe..071d8fc702 100644 --- a/tests/numerics/project_bv_curl_conf_03.cc +++ b/tests/numerics/project_bv_curl_conf_03.cc @@ -39,8 +39,8 @@ main(int argc, char **argv) Triangulation triangulation; GridGenerator::hyper_cube(triangulation, 0, 1, true); - MappingQ mapping(1); - ConstraintMatrix constraints; + MappingQ mapping(1); + AffineConstraints constraints; // Testing cases with only Nedelec Elements in FE_System { -- 2.39.5