From: Matthias Maier Date: Fri, 15 Jun 2018 19:02:29 +0000 (-0500) Subject: tests: rename ConstraintMatrix to AffineConstraints X-Git-Tag: v9.1.0-rc1~1020^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f558e27bbdd54d2c77426384e360743719fdba8;p=dealii.git tests: rename ConstraintMatrix to AffineConstraints --- diff --git a/tests/arpack/arpack_advection_diffusion.cc b/tests/arpack/arpack_advection_diffusion.cc index 6a554640e0..b32b20244f 100644 --- a/tests/arpack/arpack_advection_diffusion.cc +++ b/tests/arpack/arpack_advection_diffusion.cc @@ -99,7 +99,7 @@ private: std::vector> eigenvectors; std::vector> eigenvalues; - ConstraintMatrix constraints; + AffineConstraints constraints; unsigned int n_eigenvalues; }; diff --git a/tests/arpack/parpack_advection_diffusion_petsc.cc b/tests/arpack/parpack_advection_diffusion_petsc.cc index e2b0c25a32..73f6381bf5 100644 --- a/tests/arpack/parpack_advection_diffusion_petsc.cc +++ b/tests/arpack/parpack_advection_diffusion_petsc.cc @@ -148,12 +148,12 @@ test() dealii::Utilities::MPI::this_mpi_process(mpi_communicator); - dealii::Triangulation triangulation; - dealii::DoFHandler dof_handler(triangulation); - dealii::FE_Q fe(1); - dealii::ConstraintMatrix constraints; - dealii::IndexSet locally_owned_dofs; - dealii::IndexSet locally_relevant_dofs; + dealii::Triangulation triangulation; + dealii::DoFHandler dof_handler(triangulation); + dealii::FE_Q fe(1); + dealii::AffineConstraints constraints; + dealii::IndexSet locally_owned_dofs; + dealii::IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector arpack_vectors; diff --git a/tests/arpack/parpack_advection_diffusion_trilinos.cc b/tests/arpack/parpack_advection_diffusion_trilinos.cc index 5b9b448bfd..671d9db0e2 100644 --- a/tests/arpack/parpack_advection_diffusion_trilinos.cc +++ b/tests/arpack/parpack_advection_diffusion_trilinos.cc @@ -122,12 +122,12 @@ test() Utilities::MPI::this_mpi_process(mpi_communicator); - Triangulation triangulation; - DoFHandler dof_handler(triangulation); - FE_Q fe(1); - ConstraintMatrix constraints; - IndexSet locally_owned_dofs; - IndexSet locally_relevant_dofs; + Triangulation triangulation; + DoFHandler dof_handler(triangulation); + FE_Q fe(1); + AffineConstraints constraints; + IndexSet locally_owned_dofs; + IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector arpack_vectors; diff --git a/tests/arpack/step-36_ar.cc b/tests/arpack/step-36_ar.cc index e6de73ad02..1c3b1e34e6 100644 --- a/tests/arpack/step-36_ar.cc +++ b/tests/arpack/step-36_ar.cc @@ -92,7 +92,7 @@ namespace Step36 std::vector> eigenfunctions; std::vector> eigenvalues; - ConstraintMatrix constraints; + AffineConstraints constraints; }; diff --git a/tests/arpack/step-36_ar_shift.cc b/tests/arpack/step-36_ar_shift.cc index c055645a3f..feb484adcf 100644 --- a/tests/arpack/step-36_ar_shift.cc +++ b/tests/arpack/step-36_ar_shift.cc @@ -85,7 +85,7 @@ namespace Step36 std::vector> eigenfunctions; std::vector> eigenvalues; - ConstraintMatrix constraints; + AffineConstraints constraints; }; diff --git a/tests/arpack/step-36_parpack.cc b/tests/arpack/step-36_parpack.cc index 62fbd6b9d7..3a708d2a21 100644 --- a/tests/arpack/step-36_parpack.cc +++ b/tests/arpack/step-36_parpack.cc @@ -151,12 +151,12 @@ test() dealii::Utilities::MPI::this_mpi_process(mpi_communicator); - dealii::Triangulation triangulation; - dealii::DoFHandler dof_handler(triangulation); - dealii::FE_Q fe(1); - dealii::ConstraintMatrix constraints; - dealii::IndexSet locally_owned_dofs; - dealii::IndexSet locally_relevant_dofs; + dealii::Triangulation triangulation; + dealii::DoFHandler dof_handler(triangulation); + dealii::FE_Q fe(1); + dealii::AffineConstraints constraints; + dealii::IndexSet locally_owned_dofs; + dealii::IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector eigenvalues; diff --git a/tests/arpack/step-36_parpack_mf.cc b/tests/arpack/step-36_parpack_mf.cc index f6ffb8aece..03cbbb55ff 100644 --- a/tests/arpack/step-36_parpack_mf.cc +++ b/tests/arpack/step-36_parpack_mf.cc @@ -87,7 +87,7 @@ test() IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, diff --git a/tests/arpack/step-36_parpack_mf_02.cc b/tests/arpack/step-36_parpack_mf_02.cc index 55bb6257a8..52c8772ab7 100644 --- a/tests/arpack/step-36_parpack_mf_02.cc +++ b/tests/arpack/step-36_parpack_mf_02.cc @@ -86,7 +86,7 @@ test() IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, diff --git a/tests/arpack/step-36_parpack_mf_03.cc b/tests/arpack/step-36_parpack_mf_03.cc index 293f273dca..4b2ff0bf31 100644 --- a/tests/arpack/step-36_parpack_mf_03.cc +++ b/tests/arpack/step-36_parpack_mf_03.cc @@ -87,7 +87,7 @@ test() IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, diff --git a/tests/arpack/step-36_parpack_trilinos.cc b/tests/arpack/step-36_parpack_trilinos.cc index b222df74f5..9af1726d6f 100644 --- a/tests/arpack/step-36_parpack_trilinos.cc +++ b/tests/arpack/step-36_parpack_trilinos.cc @@ -125,12 +125,12 @@ test() Utilities::MPI::this_mpi_process(mpi_communicator); - Triangulation triangulation; - DoFHandler dof_handler(triangulation); - FE_Q fe(1); - ConstraintMatrix constraints; - IndexSet locally_owned_dofs; - IndexSet locally_relevant_dofs; + Triangulation triangulation; + DoFHandler dof_handler(triangulation); + FE_Q fe(1); + AffineConstraints constraints; + IndexSet locally_owned_dofs; + IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector eigenvalues; diff --git a/tests/bits/christian_1.cc b/tests/bits/christian_1.cc index d61b771623..2f88ab96fe 100644 --- a/tests/bits/christian_1.cc +++ b/tests/bits/christian_1.cc @@ -172,7 +172,7 @@ main() DoFToolsEx::transfer(dof, sol, both_dof, both_sol); // handle hanging nodes - ConstraintMatrix both_constraints; + AffineConstraints both_constraints; DoFTools::make_hanging_node_constraints(both_dof, both_constraints); both_constraints.close(); both_constraints.distribute(both_sol); diff --git a/tests/bits/face_orientation_and_fe_nedelec_01.cc b/tests/bits/face_orientation_and_fe_nedelec_01.cc index 508d0910eb..a77b91afc5 100644 --- a/tests/bits/face_orientation_and_fe_nedelec_01.cc +++ b/tests/bits/face_orientation_and_fe_nedelec_01.cc @@ -120,7 +120,7 @@ do_project(const Triangulation &triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/bits/face_orientation_and_fe_q_01.cc b/tests/bits/face_orientation_and_fe_q_01.cc index a5c96e85ad..bdcd55d4c8 100644 --- a/tests/bits/face_orientation_and_fe_q_01.cc +++ b/tests/bits/face_orientation_and_fe_q_01.cc @@ -123,7 +123,7 @@ do_project(const Triangulation &triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/bits/face_orientation_and_fe_q_02.cc b/tests/bits/face_orientation_and_fe_q_02.cc index 8ba66ac751..36182bbc7f 100644 --- a/tests/bits/face_orientation_and_fe_q_02.cc +++ b/tests/bits/face_orientation_and_fe_q_02.cc @@ -111,7 +111,7 @@ do_project(const Triangulation &triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/bits/face_orientation_crash.cc b/tests/bits/face_orientation_crash.cc index 17fd7f51e8..abb9149e9f 100644 --- a/tests/bits/face_orientation_crash.cc +++ b/tests/bits/face_orientation_crash.cc @@ -75,7 +75,7 @@ check() // constraints. this should trip the // new code using the hp constraints, // added in late July 2006 - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); for (unsigned int j = 0; j < dof.n_dofs(); ++j) diff --git a/tests/bits/fe_field_function_02.cc b/tests/bits/fe_field_function_02.cc index b8e7272749..66dc1b2097 100644 --- a/tests/bits/fe_field_function_02.cc +++ b/tests/bits/fe_field_function_02.cc @@ -75,7 +75,7 @@ test() // consequently subtracting the vector from // itself should yield zero { - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dh, cm, QGauss(3), fef, v2); } diff --git a/tests/bits/fe_field_function_02_vector.cc b/tests/bits/fe_field_function_02_vector.cc index 3bf5f3899b..b7d373d441 100644 --- a/tests/bits/fe_field_function_02_vector.cc +++ b/tests/bits/fe_field_function_02_vector.cc @@ -93,7 +93,7 @@ test() // consequently subtracting the vector from // itself should yield zero { - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dh, cm, QGauss(3), fef, v2); } diff --git a/tests/bits/fe_q_constraints.cc b/tests/bits/fe_q_constraints.cc index be3e3808a1..e8fbe2157d 100644 --- a/tests/bits/fe_q_constraints.cc +++ b/tests/bits/fe_q_constraints.cc @@ -113,10 +113,10 @@ private: void test(); - Triangulation triangulation; - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix hanging_node_constraints; + Triangulation triangulation; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints hanging_node_constraints; }; template diff --git a/tests/bits/fe_system.cc b/tests/bits/fe_system.cc index 42bfc4c488..aa643cccdc 100644 --- a/tests/bits/fe_system.cc +++ b/tests/bits/fe_system.cc @@ -54,7 +54,7 @@ test() dofh.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); cm.close(); diff --git a/tests/bits/fe_tools_05.cc b/tests/bits/fe_tools_05.cc index f13c4188be..06c3cfbadc 100644 --- a/tests/bits/fe_tools_05.cc +++ b/tests/bits/fe_tools_05.cc @@ -46,7 +46,7 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> tria(make_tria()); std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(*dof2, cm); cm.close(); diff --git a/tests/bits/fe_tools_06.cc b/tests/bits/fe_tools_06.cc index 5e4466782c..4a072a454b 100644 --- a/tests/bits/fe_tools_06.cc +++ b/tests/bits/fe_tools_06.cc @@ -48,7 +48,7 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> tria(make_tria()); std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm1, cm2; + AffineConstraints cm1, cm2; DoFTools::make_hanging_node_constraints(*dof1, cm1); DoFTools::make_hanging_node_constraints(*dof2, cm2); cm1.close(); diff --git a/tests/bits/fe_tools_06b.cc b/tests/bits/fe_tools_06b.cc index 56633c7bbb..392f2d77a4 100644 --- a/tests/bits/fe_tools_06b.cc +++ b/tests/bits/fe_tools_06b.cc @@ -49,7 +49,7 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> tria(make_tria()); std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm1, cm2; + AffineConstraints cm1, cm2; DoFTools::make_hanging_node_constraints(*dof1, cm1); DoFTools::make_hanging_node_constraints(*dof2, cm2); cm1.close(); diff --git a/tests/bits/fe_tools_07.cc b/tests/bits/fe_tools_07.cc index 04cce17a93..56cfe83f41 100644 --- a/tests/bits/fe_tools_07.cc +++ b/tests/bits/fe_tools_07.cc @@ -46,7 +46,7 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> tria(make_tria()); std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm1, cm2; + AffineConstraints cm1, cm2; DoFTools::make_hanging_node_constraints(*dof1, cm1); DoFTools::make_hanging_node_constraints(*dof2, cm2); cm1.close(); diff --git a/tests/bits/fe_tools_08.cc b/tests/bits/fe_tools_08.cc index c567e4e46c..7c51785c53 100644 --- a/tests/bits/fe_tools_08.cc +++ b/tests/bits/fe_tools_08.cc @@ -52,7 +52,7 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> tria(make_tria()); std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(*dof2, cm); cm.close(); diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index ef422c66e3..9dca934c55 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -159,7 +159,7 @@ private: // object which holds a list of // constraints originating from // the hanging nodes: - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; @@ -463,14 +463,14 @@ LaplaceProblem::setup_system() // The next step is closing // this object. For this note that, // in principle, the - // ConstraintMatrix class can + // AffineConstraints class can // hold other constraints as well, // i.e. constraints that do not // stem from hanging // nodes. Sometimes, it is useful // to use such constraints, in // which case they may be added to - // the ConstraintMatrix object + // the AffineConstraints object // after the hanging node // constraints were computed. After // all constraints have been added, diff --git a/tests/bits/make_boundary_constraints_01.cc b/tests/bits/make_boundary_constraints_01.cc index 87edad98cb..4b04a497ca 100644 --- a/tests/bits/make_boundary_constraints_01.cc +++ b/tests/bits/make_boundary_constraints_01.cc @@ -91,7 +91,7 @@ test() 0, Functions::ConstantFunction(1.), boundary_values); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); DoFTools::make_zero_boundary_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/bits/make_boundary_constraints_02.cc b/tests/bits/make_boundary_constraints_02.cc index 2615911485..09da428c2a 100644 --- a/tests/bits/make_boundary_constraints_02.cc +++ b/tests/bits/make_boundary_constraints_02.cc @@ -97,7 +97,7 @@ test() 1, Functions::ConstantFunction(1.), boundary_values); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); DoFTools::make_zero_boundary_constraints(dof_handler, 1, constraints); constraints.close(); diff --git a/tests/bits/make_boundary_constraints_03.cc b/tests/bits/make_boundary_constraints_03.cc index 5c93cf5b9e..0f8e8f1a3a 100644 --- a/tests/bits/make_boundary_constraints_03.cc +++ b/tests/bits/make_boundary_constraints_03.cc @@ -61,7 +61,7 @@ test() // DoFRenumbering::component_wise(dof_handler); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; FEValuesExtractors::Vector velocities(1); ComponentMask mask = fe.component_mask(velocities); diff --git a/tests/bits/periodicity_01.cc b/tests/bits/periodicity_01.cc index fd79935b45..0e389d2b26 100644 --- a/tests/bits/periodicity_01.cc +++ b/tests/bits/periodicity_01.cc @@ -53,7 +53,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0), (++dof_handler.begin(0))->face(1), cm); diff --git a/tests/bits/periodicity_02.cc b/tests/bits/periodicity_02.cc index a03fb505cf..d088f8175a 100644 --- a/tests/bits/periodicity_02.cc +++ b/tests/bits/periodicity_02.cc @@ -58,7 +58,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0), (++dof_handler.begin(0))->face(1), cm); diff --git a/tests/bits/periodicity_03.cc b/tests/bits/periodicity_03.cc index f1128fa0ca..bfdb6f2bea 100644 --- a/tests/bits/periodicity_03.cc +++ b/tests/bits/periodicity_03.cc @@ -60,7 +60,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0), (++dof_handler.begin(0))->face(1), cm); diff --git a/tests/bits/periodicity_04.cc b/tests/bits/periodicity_04.cc index 5cc1512783..8736065ac8 100644 --- a/tests/bits/periodicity_04.cc +++ b/tests/bits/periodicity_04.cc @@ -67,7 +67,7 @@ test() std::vector mask(2, true); mask[1] = false; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_periodicity_constraints(dof_handler.begin(0)->face(0), (++dof_handler.begin(0))->face(1), cm, diff --git a/tests/bits/periodicity_05.cc b/tests/bits/periodicity_05.cc index 60fcb11ae2..e1ea506f59 100644 --- a/tests/bits/periodicity_05.cc +++ b/tests/bits/periodicity_05.cc @@ -79,10 +79,10 @@ private: void setup_system(); - Triangulation<2> triangulation; - FE_Q<2> fe; - DoFHandler<2> dof_handler; - ConstraintMatrix constraints; + Triangulation<2> triangulation; + FE_Q<2> fe; + DoFHandler<2> dof_handler; + AffineConstraints constraints; }; Deal2PeriodicBug::Deal2PeriodicBug() diff --git a/tests/bits/periodicity_06.cc b/tests/bits/periodicity_06.cc index e87dcd6120..deaa21b166 100644 --- a/tests/bits/periodicity_06.cc +++ b/tests/bits/periodicity_06.cc @@ -46,11 +46,11 @@ using namespace dealii; -ConstraintMatrix +AffineConstraints make_constraint_matrix(const DoFHandler<2> &dof_handler, int version) { - constexpr int dim = 2; - ConstraintMatrix constraints; + constexpr int dim = 2; + AffineConstraints constraints; constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, constraints); @@ -240,7 +240,7 @@ main(int argc, char *argv[]) DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - std::vector constraints(8); + std::vector> constraints(8); PeriodicReference periodic_function; diff --git a/tests/bits/periodicity_07.cc b/tests/bits/periodicity_07.cc index d471bca1fc..1b91c0d4a1 100644 --- a/tests/bits/periodicity_07.cc +++ b/tests/bits/periodicity_07.cc @@ -46,12 +46,12 @@ using namespace dealii; -ConstraintMatrix +AffineConstraints make_constraint_matrix(const DoFHandler<3> &dof_handler, int version) { constexpr int dim = 3; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, constraints); @@ -269,7 +269,7 @@ main(int argc, char *argv[]) DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - std::vector constraints(4); + std::vector> constraints(4); PeriodicReference periodic_function; diff --git a/tests/bits/solution_transfer.cc b/tests/bits/solution_transfer.cc index af2d7ef893..77d02cdcc8 100644 --- a/tests/bits/solution_transfer.cc +++ b/tests/bits/solution_transfer.cc @@ -71,15 +71,15 @@ transfer(std::ostream &out) Triangulation tria; GridGenerator::hyper_cube(tria); tria.refine_global(5 - dim); - FE_Q fe_q(1); - FE_DGQ fe_dgq(1); - DoFHandler q_dof_handler(tria); - DoFHandler dgq_dof_handler(tria); - Vector q_solution; - Vector dgq_solution; - MappingQGeneric mapping(1); - DataOut q_data_out, dgq_data_out; - ConstraintMatrix cm; + FE_Q fe_q(1); + FE_DGQ fe_dgq(1); + DoFHandler q_dof_handler(tria); + DoFHandler dgq_dof_handler(tria); + Vector q_solution; + Vector dgq_solution; + MappingQGeneric mapping(1); + DataOut q_data_out, dgq_data_out; + AffineConstraints cm; cm.close(); q_dof_handler.distribute_dofs(fe_q); diff --git a/tests/bits/static_condensation.cc b/tests/bits/static_condensation.cc index d1ad23da48..96dabf410e 100644 --- a/tests/bits/static_condensation.cc +++ b/tests/bits/static_condensation.cc @@ -211,23 +211,23 @@ private: void process_solution(const unsigned int cycle); - Triangulation triangulation; - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; - - FE_TraceQ fe_trace; - DoFHandler dof_handler_trace; - ConstraintMatrix constraints_trace; - SparsityPattern sparsity_pattern_trace; - SparseMatrix system_matrix_trace; - Vector solution_trace_full; - Vector solution_trace; - Vector system_rhs_trace; + Triangulation triangulation; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; + + FE_TraceQ fe_trace; + DoFHandler dof_handler_trace; + AffineConstraints constraints_trace; + SparsityPattern sparsity_pattern_trace; + SparseMatrix system_matrix_trace; + Vector solution_trace_full; + Vector solution_trace; + Vector system_rhs_trace; const RefinementMode refinement_mode; diff --git a/tests/bits/step-11.cc b/tests/bits/step-11.cc index 70e70e4326..7f78c529d7 100644 --- a/tests/bits/step-11.cc +++ b/tests/bits/step-11.cc @@ -75,9 +75,9 @@ private: DoFHandler dof_handler; MappingQ mapping; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - ConstraintMatrix mean_value_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + AffineConstraints mean_value_constraints; Vector solution; Vector system_rhs; diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index 9ba4830c18..530325a04b 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -281,10 +281,10 @@ namespace LaplaceSolver void solve(Vector &solution) const; - ConstraintMatrix hanging_node_constraints; - SparsityPattern sparsity_pattern; - SparseMatrix matrix; - Vector rhs; + AffineConstraints hanging_node_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix matrix; + Vector rhs; }; void @@ -445,7 +445,7 @@ namespace LaplaceSolver { hanging_node_constraints.clear(); - void (*mhnc_p)(const DoFHandler &, ConstraintMatrix &) = + void (*mhnc_p)(const DoFHandler &, AffineConstraints &) = &DoFTools::make_hanging_node_constraints; Threads::Thread<> mhnc_thread = diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index 9e1a14c058..4c623a2858 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -363,10 +363,10 @@ namespace LaplaceSolver void solve(Vector &solution) const; - ConstraintMatrix hanging_node_constraints; - SparsityPattern sparsity_pattern; - SparseMatrix matrix; - Vector rhs; + AffineConstraints hanging_node_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix matrix; + Vector rhs; }; void @@ -527,7 +527,7 @@ namespace LaplaceSolver { hanging_node_constraints.clear(); - void (*mhnc_p)(const DoFHandler &, ConstraintMatrix &) = + void (*mhnc_p)(const DoFHandler &, AffineConstraints &) = &DoFTools::make_hanging_node_constraints; Threads::Thread<> mhnc_thread = @@ -1576,7 +1576,7 @@ namespace LaplaceSolver const PrimalSolver &primal_solver = *this; const DualSolver & dual_solver = *this; - ConstraintMatrix primal_hanging_node_constraints; + AffineConstraints primal_hanging_node_constraints; DoFTools::make_hanging_node_constraints(primal_solver.dof_handler, primal_hanging_node_constraints); primal_hanging_node_constraints.close(); @@ -1610,7 +1610,7 @@ namespace LaplaceSolver const PrimalSolver &primal_solver = *this; const DualSolver & dual_solver = *this; - ConstraintMatrix dual_hanging_node_constraints; + AffineConstraints dual_hanging_node_constraints; DoFTools::make_hanging_node_constraints(dual_solver.dof_handler, dual_hanging_node_constraints); dual_hanging_node_constraints.close(); @@ -1621,7 +1621,7 @@ namespace LaplaceSolver dual_hanging_node_constraints, primal_solution); - ConstraintMatrix primal_hanging_node_constraints; + AffineConstraints primal_hanging_node_constraints; DoFTools::make_hanging_node_constraints(primal_solver.dof_handler, primal_hanging_node_constraints); primal_hanging_node_constraints.close(); diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc index 5ba33ff924..dd4e316d1c 100644 --- a/tests/bits/step-51.cc +++ b/tests/bits/step-51.cc @@ -313,7 +313,7 @@ namespace Step51 DoFHandler dof_handler_u_post; Vector solution_u_post; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index f7c18cab59..246ea3414e 100644 --- a/tests/bits/step-51p.cc +++ b/tests/bits/step-51p.cc @@ -313,7 +313,7 @@ namespace Step51 DoFHandler dof_handler_u_post; Vector solution_u_post; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-6-racoptimize-2.cc b/tests/bits/step-6-racoptimize-2.cc index 301468646d..73730a40ea 100644 --- a/tests/bits/step-6-racoptimize-2.cc +++ b/tests/bits/step-6-racoptimize-2.cc @@ -85,7 +85,7 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-6-racoptimize.cc b/tests/bits/step-6-racoptimize.cc index 1d31b1a68a..a4d14aec1b 100644 --- a/tests/bits/step-6-racoptimize.cc +++ b/tests/bits/step-6-racoptimize.cc @@ -85,7 +85,7 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index bc62e4d2aa..d176601cf5 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -80,7 +80,7 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index e1d52ec324..87c0e2f35b 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -210,7 +210,7 @@ private: SmartPointer> fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index 5b06d37924..f64bc4efc2 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -83,7 +83,7 @@ private: FESystem fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc index a359aa3e31..96a07b9835 100644 --- a/tests/codim_one/gradients.cc +++ b/tests/codim_one/gradients.cc @@ -110,8 +110,8 @@ test(std::string filename) exp[2] = 0; Functions::Monomial monomial(exp); - const QGauss quad(5); - ConstraintMatrix constraints; + const QGauss quad(5); + AffineConstraints constraints; constraints.close(); VectorTools::project(dof_handler, constraints, quad, monomial, projected_one); diff --git a/tests/codim_one/gradients_1.cc b/tests/codim_one/gradients_1.cc index bf783d6740..4f12d8a2cd 100644 --- a/tests/codim_one/gradients_1.cc +++ b/tests/codim_one/gradients_1.cc @@ -91,8 +91,8 @@ test(std::string filename, unsigned int degree = 1) // exp[2]=0; // Functions::Monomial the_function(exp); - const QGauss quad(2 * fe.degree + 1); - ConstraintMatrix constraints; + const QGauss quad(2 * fe.degree + 1); + AffineConstraints constraints; constraints.close(); VectorTools::project( mapping, dof_handler, constraints, quad, the_function, projected_one); diff --git a/tests/codim_one/hanging_nodes_01.cc b/tests/codim_one/hanging_nodes_01.cc index 2fc0967498..7d02c523b6 100644 --- a/tests/codim_one/hanging_nodes_01.cc +++ b/tests/codim_one/hanging_nodes_01.cc @@ -67,7 +67,7 @@ main() /*****************************************************************/ FE_Q fe(1); DoFHandler dh(boundary_mesh); - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; dh.distribute_dofs(fe); hanging_node_constraints.clear(); diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc index 5274437b08..c59014867c 100644 --- a/tests/codim_one/projection.cc +++ b/tests/codim_one/projection.cc @@ -71,7 +71,7 @@ test(std::string filename, unsigned int n) Functions::CosineFunction cosine; QGauss quad(5); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); VectorTools::project(dof_handler, constraints, quad, cosine, projected_one); diff --git a/tests/codim_one/projection_dgp.cc b/tests/codim_one/projection_dgp.cc index 55c772c220..20a0e267cf 100644 --- a/tests/codim_one/projection_dgp.cc +++ b/tests/codim_one/projection_dgp.cc @@ -72,7 +72,7 @@ test(std::string filename, unsigned int n) Functions::CosineFunction cosine; QGauss quad(5); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); VectorTools::project( dof_handler, constraints, quad, cosine, interpolated_one); diff --git a/tests/cuda/matrix_vector_common.h b/tests/cuda/matrix_vector_common.h index 0d57fe9f5c..1fe3f76aac 100644 --- a/tests/cuda/matrix_vector_common.h +++ b/tests/cuda/matrix_vector_common.h @@ -55,7 +55,8 @@ test(); template void -do_test(const DoFHandler &dof, const ConstraintMatrix &constraints) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; diff --git a/tests/data_out/data_out_postprocessor_tensor_01.cc b/tests/data_out/data_out_postprocessor_tensor_01.cc index ff620df6c7..678c1a35d8 100644 --- a/tests/data_out/data_out_postprocessor_tensor_01.cc +++ b/tests/data_out/data_out_postprocessor_tensor_01.cc @@ -86,7 +86,7 @@ namespace Step8 FESystem fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/data_out/data_out_postprocessor_vector_03.cc b/tests/data_out/data_out_postprocessor_vector_03.cc index 6c1d051dc2..6bad89ee0e 100644 --- a/tests/data_out/data_out_postprocessor_vector_03.cc +++ b/tests/data_out/data_out_postprocessor_vector_03.cc @@ -87,7 +87,7 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/dofs/block_relaxation_01.cc b/tests/dofs/block_relaxation_01.cc index 040b45565a..15a4affea1 100644 --- a/tests/dofs/block_relaxation_01.cc +++ b/tests/dofs/block_relaxation_01.cc @@ -54,7 +54,7 @@ make_stokes_matrix(const DoFHandler &dof_handler, const unsigned int degree = fe.degree; system_matrix = 0; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); FEValues fe_values(fe, quadrature_formula, diff --git a/tests/dofs/dof_constraints_01.cc b/tests/dofs/dof_constraints_01.cc index 3dda2e709f..825e0ce244 100644 --- a/tests/dofs/dof_constraints_01.cc +++ b/tests/dofs/dof_constraints_01.cc @@ -68,7 +68,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_02.cc b/tests/dofs/dof_constraints_02.cc index 7813c868c3..18b1175995 100644 --- a/tests/dofs/dof_constraints_02.cc +++ b/tests/dofs/dof_constraints_02.cc @@ -66,7 +66,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_03.cc b/tests/dofs/dof_constraints_03.cc index ad22e28ea3..a0c6a09fa2 100644 --- a/tests/dofs/dof_constraints_03.cc +++ b/tests/dofs/dof_constraints_03.cc @@ -63,7 +63,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_04.cc b/tests/dofs/dof_constraints_04.cc index 9e16baa5cb..5928f5e85b 100644 --- a/tests/dofs/dof_constraints_04.cc +++ b/tests/dofs/dof_constraints_04.cc @@ -61,7 +61,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_05.cc b/tests/dofs/dof_constraints_05.cc index 1a1b301adc..19f635e6a1 100644 --- a/tests/dofs/dof_constraints_05.cc +++ b/tests/dofs/dof_constraints_05.cc @@ -61,7 +61,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_06.cc b/tests/dofs/dof_constraints_06.cc index 9e1576558d..91bf9697a8 100644 --- a/tests/dofs/dof_constraints_06.cc +++ b/tests/dofs/dof_constraints_06.cc @@ -59,7 +59,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_07.cc b/tests/dofs/dof_constraints_07.cc index 08a25607a3..a36802caa0 100644 --- a/tests/dofs/dof_constraints_07.cc +++ b/tests/dofs/dof_constraints_07.cc @@ -63,7 +63,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_08.cc b/tests/dofs/dof_constraints_08.cc index bb957af19a..ed2d45ab95 100644 --- a/tests/dofs/dof_constraints_08.cc +++ b/tests/dofs/dof_constraints_08.cc @@ -62,7 +62,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_09.cc b/tests/dofs/dof_constraints_09.cc index 244501d7b8..762afdd612 100644 --- a/tests/dofs/dof_constraints_09.cc +++ b/tests/dofs/dof_constraints_09.cc @@ -63,7 +63,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_10.cc b/tests/dofs/dof_constraints_10.cc index a8a6551c56..66fffc7b3c 100644 --- a/tests/dofs/dof_constraints_10.cc +++ b/tests/dofs/dof_constraints_10.cc @@ -61,7 +61,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_11.cc b/tests/dofs/dof_constraints_11.cc index 54007e31b9..75f1d56675 100644 --- a/tests/dofs/dof_constraints_11.cc +++ b/tests/dofs/dof_constraints_11.cc @@ -62,7 +62,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_constraints_11_x.cc b/tests/dofs/dof_constraints_11_x.cc index 81127ba0cd..31ecc8d278 100644 --- a/tests/dofs/dof_constraints_11_x.cc +++ b/tests/dofs/dof_constraints_11_x.cc @@ -60,7 +60,7 @@ test() dof_handler.distribute_dofs(fe); deallog << "Number of dofs: " << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); deallog << "Number of constraints: " << constraints.n_constraints() diff --git a/tests/dofs/dof_test.cc b/tests/dofs/dof_test.cc index e48dc4ffb0..a5a6c417f6 100644 --- a/tests/dofs/dof_test.cc +++ b/tests/dofs/dof_test.cc @@ -328,7 +328,7 @@ TestCases::run(const unsigned int test_case) // computing constraints deallog << " Computing constraints..." << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(*dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/dofs/dof_tools_01a_constraints_false.cc b/tests/dofs/dof_tools_01a_constraints_false.cc index e77d21059f..3d98de1ce0 100644 --- a/tests/dofs/dof_tools_01a_constraints_false.cc +++ b/tests/dofs/dof_tools_01a_constraints_false.cc @@ -23,7 +23,7 @@ // DoFTools:: // make_sparsity_pattern (const DoFHandler &, // SparsityPattern &, -// ConstraintMatrix, +// AffineConstraints, // true); @@ -32,7 +32,7 @@ template void check_this(const DoFHandler &dof_handler) { - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_01a_constraints_true.cc b/tests/dofs/dof_tools_01a_constraints_true.cc index f7b06a317f..3d3bd7cc5b 100644 --- a/tests/dofs/dof_tools_01a_constraints_true.cc +++ b/tests/dofs/dof_tools_01a_constraints_true.cc @@ -23,7 +23,7 @@ // DoFTools:: // make_sparsity_pattern (const DoFHandler &, // SparsityPattern &, -// ConstraintMatrix, +// AffineConstraints, // true); @@ -32,7 +32,7 @@ template void check_this(const DoFHandler &dof_handler) { - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_01a_subdomain.cc b/tests/dofs/dof_tools_01a_subdomain.cc index 9b7456a5ea..4c5cc5b9ce 100644 --- a/tests/dofs/dof_tools_01a_subdomain.cc +++ b/tests/dofs/dof_tools_01a_subdomain.cc @@ -38,7 +38,8 @@ check_this(const DoFHandler &dof_handler) // pass a subdomain id; note that // the framework sets the subdomain // id to the level of each cell - DoFTools::make_sparsity_pattern(dof_handler, sp, ConstraintMatrix(), true, 2); + DoFTools::make_sparsity_pattern( + dof_handler, sp, AffineConstraints(), true, 2); sp.compress(); // write out 10 lines of this diff --git a/tests/dofs/dof_tools_02a_constraints_false.cc b/tests/dofs/dof_tools_02a_constraints_false.cc index 5d2710cf90..9354aec95b 100644 --- a/tests/dofs/dof_tools_02a_constraints_false.cc +++ b/tests/dofs/dof_tools_02a_constraints_false.cc @@ -24,7 +24,7 @@ // make_sparsity_pattern (const DoFHandler &, // std::vector > &, // SparsityPattern &, -// ConstraintMatrix, +// AffineConstraints, // true); @@ -42,7 +42,7 @@ check_this(const DoFHandler &dof_handler) for (unsigned int i = 0; i < n_components; ++i) mask[i][i] = mask[i][n_components - i - 1] = DoFTools::always; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_02a_constraints_true.cc b/tests/dofs/dof_tools_02a_constraints_true.cc index 008594ad90..6fe34bad83 100644 --- a/tests/dofs/dof_tools_02a_constraints_true.cc +++ b/tests/dofs/dof_tools_02a_constraints_true.cc @@ -24,7 +24,7 @@ // make_sparsity_pattern (const DoFHandler &, // Table<2,DoFTools::Coupling> &, // SparsityPattern &, -// ConstraintMatrix, +// AffineConstraints, // true); @@ -42,7 +42,7 @@ check_this(const DoFHandler &dof_handler) for (unsigned int i = 0; i < n_components; ++i) mask[i][i] = mask[i][n_components - i - 1] = DoFTools::always; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_02a_subdomain.cc b/tests/dofs/dof_tools_02a_subdomain.cc index 25b095613f..b45d72073a 100644 --- a/tests/dofs/dof_tools_02a_subdomain.cc +++ b/tests/dofs/dof_tools_02a_subdomain.cc @@ -50,7 +50,7 @@ check_this(const DoFHandler &dof_handler) // the framework sets the subdomain // id to the level of each cell DoFTools::make_sparsity_pattern( - dof_handler, mask, sp, ConstraintMatrix(), true, 2); + dof_handler, mask, sp, AffineConstraints(), true, 2); sp.compress(); // write out 10 lines of this diff --git a/tests/dofs/dof_tools_03.cc b/tests/dofs/dof_tools_03.cc index 18c3b394d5..917d811436 100644 --- a/tests/dofs/dof_tools_03.cc +++ b/tests/dofs/dof_tools_03.cc @@ -23,7 +23,7 @@ // check // DoFTools:: // make_hanging_node_constraints (const DoFHandler &, -// ConstraintMatrix &); +// AffineConstraints &); @@ -47,7 +47,7 @@ check_this(const DoFHandler &dof_handler) if (dof_handler.get_fe().constraints_are_implemented() == false) return; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_04.cc b/tests/dofs/dof_tools_04.cc index cba41c337d..a601a5996e 100644 --- a/tests/dofs/dof_tools_04.cc +++ b/tests/dofs/dof_tools_04.cc @@ -31,7 +31,7 @@ check_this(const DoFHandler &dof_handler) std::vector hanging_node_dofs(n_dofs); DoFTools::extract_hanging_node_dofs(dof_handler, hanging_node_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/dof_tools_04a.cc b/tests/dofs/dof_tools_04a.cc index 1112eee21c..2716d76cd0 100644 --- a/tests/dofs/dof_tools_04a.cc +++ b/tests/dofs/dof_tools_04a.cc @@ -56,7 +56,7 @@ check_this(const DoFHandler &dof_handler) std::vector is_hanging_node_constrained(n_dofs); DoFTools::extract_hanging_node_dofs(dof_handler, is_hanging_node_constrained); - ConstraintMatrix constraints(locally_relevant_dofs); + AffineConstraints constraints(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/dof_tools_18a_1d.cc b/tests/dofs/dof_tools_18a_1d.cc index abc8d1c12e..f6e6e08898 100644 --- a/tests/dofs/dof_tools_18a_1d.cc +++ b/tests/dofs/dof_tools_18a_1d.cc @@ -39,7 +39,7 @@ // DoFTools:: // make_flux_sparsity_pattern (const DoFHandler &, // SparsityPattern &, -// ConstraintMatrix &); +// AffineConstraints &); // this used to fail at one point because we forgot that in 1d // neighboring cells can be more than one level apart. with // FE_DGQ(0) elements, we get the following mesh and DoF indices: @@ -59,7 +59,9 @@ check_this(const DoFHandler &dof_handler) // create sparsity pattern SparsityPattern sp(dof_handler.n_dofs(), dof_handler.max_couplings_between_dofs() * 2); - DoFTools::make_flux_sparsity_pattern(dof_handler, sp, ConstraintMatrix()); + DoFTools::make_flux_sparsity_pattern(dof_handler, + sp, + AffineConstraints()); sp.compress(); // write out 20 lines of this diff --git a/tests/dofs/dof_tools_19.cc b/tests/dofs/dof_tools_19.cc index 3697f52513..b0cd221068 100644 --- a/tests/dofs/dof_tools_19.cc +++ b/tests/dofs/dof_tools_19.cc @@ -30,7 +30,7 @@ // check // DoFTools:: // make_hanging_node_constraints (const DoFHandler &, -// ConstraintMatrix &); +// AffineConstraints &); // // As the results of dof_tools_03 seem unclear, this test aims // at verifying the constraints by projecting a constant function @@ -65,7 +65,7 @@ check_this(const DoFHandler &dof_handler) if (dof_handler.get_fe().constraints_are_implemented() == false) return; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/dofs/dof_tools_21.cc b/tests/dofs/dof_tools_21.cc index 29c551d6c1..8a628b05d2 100644 --- a/tests/dofs/dof_tools_21.cc +++ b/tests/dofs/dof_tools_21.cc @@ -34,7 +34,7 @@ // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &) // // We project an already periodic function onto the FE space of @@ -50,7 +50,7 @@ check_this(const DoFHandler &dof_handler) { Functions::CosineFunction test_func(dof_handler.get_fe().n_components()); - ConstraintMatrix cm; + AffineConstraints cm; // Apply periodic boundary conditions only in the one direction where // we can match the (locally refined) faces: diff --git a/tests/dofs/dof_tools_21_b.cc b/tests/dofs/dof_tools_21_b.cc index 1d776b23ff..058a13a687 100644 --- a/tests/dofs/dof_tools_21_b.cc +++ b/tests/dofs/dof_tools_21_b.cc @@ -41,7 +41,7 @@ using namespace dealii; // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &, // bool, bool, bool) // for correct behaviour on non standard oriented meshes. @@ -194,9 +194,9 @@ print_matching(DoFHandler &dof_handler, const FiniteElement &fe = dof_handler.get_fe(); MappingQ mapping(1); - ConstraintMatrix constraint_matrix; - ConstraintMatrix constraint_matrix_reverse; - std::vector> support_points(dof_handler.n_dofs()); + AffineConstraints constraint_matrix; + AffineConstraints constraint_matrix_reverse; + std::vector> support_points(dof_handler.n_dofs()); DoFTools::map_dofs_to_support_points(mapping, dof_handler, support_points); diff --git a/tests/dofs/dof_tools_21_b_x.cc b/tests/dofs/dof_tools_21_b_x.cc index c67a6fef8c..f25517c88a 100644 --- a/tests/dofs/dof_tools_21_b_x.cc +++ b/tests/dofs/dof_tools_21_b_x.cc @@ -18,7 +18,7 @@ // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &, // bool, bool, bool) // for correct behaviour on non standard oriented meshes. @@ -121,8 +121,8 @@ print_matching(DoFHandler &dof_handler) const FiniteElement &fe = dof_handler.get_fe(); MappingQ mapping(1); - ConstraintMatrix constraint_matrix; - std::vector> support_points(dof_handler.n_dofs()); + AffineConstraints constraint_matrix; + std::vector> support_points(dof_handler.n_dofs()); DoFTools::map_dofs_to_support_points(mapping, dof_handler, support_points); diff --git a/tests/dofs/dof_tools_21_b_x_q3.cc b/tests/dofs/dof_tools_21_b_x_q3.cc index 720a66e359..4aa026cf70 100644 --- a/tests/dofs/dof_tools_21_b_x_q3.cc +++ b/tests/dofs/dof_tools_21_b_x_q3.cc @@ -18,7 +18,7 @@ // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &, // bool, bool, bool) // for correct behaviour on non standard oriented meshes. @@ -155,8 +155,8 @@ print_matching(DoFHandler &dof_handler) const FiniteElement &fe = dof_handler.get_fe(); MappingQ mapping(1); - ConstraintMatrix constraint_matrix; - std::vector> support_points(dof_handler.n_dofs()); + AffineConstraints constraint_matrix; + std::vector> support_points(dof_handler.n_dofs()); DoFTools::map_dofs_to_support_points(mapping, dof_handler, support_points); diff --git a/tests/dofs/dof_tools_21_b_y.cc b/tests/dofs/dof_tools_21_b_y.cc index 8cf9ffa5ca..553d54ac21 100644 --- a/tests/dofs/dof_tools_21_b_y.cc +++ b/tests/dofs/dof_tools_21_b_y.cc @@ -18,7 +18,7 @@ // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &, // bool, bool, bool) // for correct behaviour on non standard oriented meshes. @@ -120,8 +120,8 @@ print_matching(DoFHandler &dof_handler) const FiniteElement &fe = dof_handler.get_fe(); MappingQ mapping(1); - ConstraintMatrix constraint_matrix; - std::vector> support_points(dof_handler.n_dofs()); + AffineConstraints constraint_matrix; + std::vector> support_points(dof_handler.n_dofs()); DoFTools::map_dofs_to_support_points(mapping, dof_handler, support_points); diff --git a/tests/dofs/dof_tools_21_c.cc b/tests/dofs/dof_tools_21_c.cc index f05d56ee8f..62537c29f0 100644 --- a/tests/dofs/dof_tools_21_c.cc +++ b/tests/dofs/dof_tools_21_c.cc @@ -41,7 +41,7 @@ using namespace dealii; // DoFTools:: // make_periodicity_constraints (const FaceIterator &, // const FaceIterator &, -// dealii::ConstraintMatrix &, +// dealii::AffineConstraints &, // const std::vector &, // bool, bool, bool) // @@ -199,9 +199,9 @@ print_matching(DoFHandler &dof_handler, const FiniteElement &fe = dof_handler.get_fe(); MappingQ mapping(1); - ConstraintMatrix constraint_matrix; - ConstraintMatrix constraint_matrix_reverse; - std::vector> support_points(dof_handler.n_dofs()); + AffineConstraints constraint_matrix; + AffineConstraints constraint_matrix_reverse; + std::vector> support_points(dof_handler.n_dofs()); DoFTools::map_dofs_to_support_points(mapping, dof_handler, support_points); diff --git a/tests/dofs/dof_tools_22a.cc b/tests/dofs/dof_tools_22a.cc index d157ab433a..fcb767a5ba 100644 --- a/tests/dofs/dof_tools_22a.cc +++ b/tests/dofs/dof_tools_22a.cc @@ -16,7 +16,7 @@ // This test was written by Sam Cox. // Tests the behaviour of DoFTools::make_flux_sparsity_pattern (DoFHandler, -// SparsityPattern, ConstraintMatrix, bool, +// SparsityPattern, AffineConstraints, bool, // coupling, flux_coupling, subdomain_id) #include @@ -97,7 +97,7 @@ test() DoFTools::extract_locally_relevant_dofs(dh, relevant_partitioning); // Generate hanging node constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); DoFTools::make_hanging_node_constraints(dh, constraints); constraints.close(); diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc index d5cbbbd5a4..f714954cb3 100644 --- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc +++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_01.cc @@ -74,7 +74,7 @@ test(const unsigned int flag) FE_Q fe(2); dh.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dh, cm); IndexSet support = DoFTools::extract_dofs_with_support_contained_within( diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc index 89fc0cb3c5..3b10a65d84 100644 --- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc +++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_02.cc @@ -98,7 +98,7 @@ test(const unsigned int flag) IndexSet locally_relevant_set; DoFTools::extract_locally_relevant_dofs(dh, locally_relevant_set); - ConstraintMatrix cm; + AffineConstraints cm; cm.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(dh, cm); cm.close(); diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc index 99ac9dde05..0ca03a928f 100644 --- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc +++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_03.cc @@ -91,7 +91,7 @@ test(const bool left = true) FE_Q fe(2); dh.distribute_dofs(fe); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dh, cm); IndexSet support = diff --git a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc index 8ca30ea8cc..497a07c4f0 100644 --- a/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc +++ b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc @@ -101,7 +101,7 @@ test() IndexSet locally_relevant_set; DoFTools::extract_locally_relevant_dofs(dh, locally_relevant_set); - ConstraintMatrix cm; + AffineConstraints cm; cm.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(dh, cm); cm.close(); diff --git a/tests/dofs/interpolate_dgq_02.cc b/tests/dofs/interpolate_dgq_02.cc index ddf28ee744..2f6a0fc6f6 100644 --- a/tests/dofs/interpolate_dgq_02.cc +++ b/tests/dofs/interpolate_dgq_02.cc @@ -85,7 +85,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/interpolate_q_02.cc b/tests/dofs/interpolate_q_02.cc index c1c5d87337..af69b42a72 100644 --- a/tests/dofs/interpolate_q_02.cc +++ b/tests/dofs/interpolate_q_02.cc @@ -85,7 +85,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/interpolate_q_system_02.cc b/tests/dofs/interpolate_q_system_02.cc index b671903539..9d842262d3 100644 --- a/tests/dofs/interpolate_q_system_02.cc +++ b/tests/dofs/interpolate_q_system_02.cc @@ -91,7 +91,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/interpolate_q_system_mask_02.cc b/tests/dofs/interpolate_q_system_mask_02.cc index 9f6d816249..3dd37bab00 100644 --- a/tests/dofs/interpolate_q_system_mask_02.cc +++ b/tests/dofs/interpolate_q_system_mask_02.cc @@ -105,7 +105,7 @@ test() mask2.set(1, true); mask2.set(2, true); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/dofs/range_based_for_step-6.cc b/tests/dofs/range_based_for_step-6.cc index 659b6f5fc7..b3ec2c9b2a 100644 --- a/tests/dofs/range_based_for_step-6.cc +++ b/tests/dofs/range_based_for_step-6.cc @@ -84,7 +84,7 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/dofs/sparsity_pattern.cc b/tests/dofs/sparsity_pattern.cc index c2262bce08..76fc825146 100644 --- a/tests/dofs/sparsity_pattern.cc +++ b/tests/dofs/sparsity_pattern.cc @@ -115,7 +115,7 @@ check() DoFHandler dof(tr); dof.distribute_dofs(element); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/dofs/sparsity_pattern_01.cc b/tests/dofs/sparsity_pattern_01.cc index f8bde1f985..e1445b52f2 100644 --- a/tests/dofs/sparsity_pattern_01.cc +++ b/tests/dofs/sparsity_pattern_01.cc @@ -115,7 +115,7 @@ check() DoFHandler dof(tr); dof.distribute_dofs(element); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/dofs/sparsity_pattern_05.cc b/tests/dofs/sparsity_pattern_05.cc index c9987d2345..498f0f2040 100644 --- a/tests/dofs/sparsity_pattern_05.cc +++ b/tests/dofs/sparsity_pattern_05.cc @@ -85,7 +85,7 @@ check() DoFHandler dof(tr); dof.distribute_dofs(element); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/fail/abf_approximation_01.cc b/tests/fail/abf_approximation_01.cc index 6f58f023d4..263db7e723 100644 --- a/tests/fail/abf_approximation_01.cc +++ b/tests/fail/abf_approximation_01.cc @@ -355,7 +355,7 @@ double TestProjection(Mapping<2> &mapping, DoFHandler<2> *dof_handler) TestPoly<2> pol(deg); // Project solution onto RT FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints); hn_constraints.close(); @@ -465,7 +465,7 @@ main() solution_q.reinit(dof_handler->n_dofs()); deformation.reinit(dof_handler_def->n_dofs()); - ConstraintMatrix hn_constraints_def; + AffineConstraints hn_constraints_def; hn_constraints_def.clear(); DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def); hn_constraints_def.close(); diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 02f6e744f9..e6f6a53f3d 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -96,7 +96,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index 18f78174a2..d630eedaf8 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -366,10 +366,10 @@ namespace LaplaceSolver void solve(Vector &solution) const; - ConstraintMatrix hanging_node_constraints; - SparsityPattern sparsity_pattern; - SparseMatrix matrix; - Vector rhs; + AffineConstraints hanging_node_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix matrix; + Vector rhs; }; void @@ -533,7 +533,7 @@ namespace LaplaceSolver { hanging_node_constraints.clear(); - void (*mhnc_p)(const hp::DoFHandler &, ConstraintMatrix &) = + void (*mhnc_p)(const hp::DoFHandler &, AffineConstraints &) = &DoFTools::make_hanging_node_constraints; Threads::Thread<> mhnc_thread = @@ -1597,7 +1597,7 @@ namespace LaplaceSolver const PrimalSolver &primal_solver = *this; const DualSolver & dual_solver = *this; - ConstraintMatrix primal_hanging_node_constraints; + AffineConstraints primal_hanging_node_constraints; DoFTools::make_hanging_node_constraints(primal_solver.dof_handler, primal_hanging_node_constraints); primal_hanging_node_constraints.close(); @@ -1631,7 +1631,7 @@ namespace LaplaceSolver const PrimalSolver &primal_solver = *this; const DualSolver & dual_solver = *this; - ConstraintMatrix dual_hanging_node_constraints; + AffineConstraints dual_hanging_node_constraints; DoFTools::make_hanging_node_constraints(dual_solver.dof_handler, dual_hanging_node_constraints); dual_hanging_node_constraints.close(); @@ -1642,7 +1642,7 @@ namespace LaplaceSolver dual_hanging_node_constraints, primal_solution); - ConstraintMatrix primal_hanging_node_constraints; + AffineConstraints primal_hanging_node_constraints; DoFTools::make_hanging_node_constraints(primal_solver.dof_handler, primal_hanging_node_constraints); primal_hanging_node_constraints.close(); diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index 0011f7f460..2c458a1d7d 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -129,7 +129,7 @@ private: hp::FECollection fe; hp::DoFHandler dof_handler; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix matrix; diff --git a/tests/fail/rt_crash_01.cc b/tests/fail/rt_crash_01.cc index 13d40a27b1..ce8e8f07eb 100644 --- a/tests/fail/rt_crash_01.cc +++ b/tests/fail/rt_crash_01.cc @@ -55,7 +55,7 @@ check_this(const DoFHandler &dof_handler) if (dof_handler.get_fe().constraints_are_implemented() == false) return; - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.close(); diff --git a/tests/fail/rt_distorted_01.cc b/tests/fail/rt_distorted_01.cc index db21bc7709..3ea6bec800 100644 --- a/tests/fail/rt_distorted_01.cc +++ b/tests/fail/rt_distorted_01.cc @@ -343,7 +343,7 @@ main(int /*argc*/, char ** /*argv*/) deformation.reinit(dof_handler_def->n_dofs()); // Project solution onto RT FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints); hn_constraints.close(); @@ -351,7 +351,7 @@ main(int /*argc*/, char ** /*argv*/) *dof_handler, hn_constraints, QGauss<2>(6), TestMap1<2>(2), solution); // Project reference solution onto RT FE field - ConstraintMatrix hn_constraints_def; + AffineConstraints hn_constraints_def; hn_constraints_def.clear(); DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def); hn_constraints_def.close(); diff --git a/tests/fail/rt_distorted_02.cc b/tests/fail/rt_distorted_02.cc index f78381354a..230838d463 100644 --- a/tests/fail/rt_distorted_02.cc +++ b/tests/fail/rt_distorted_02.cc @@ -367,7 +367,7 @@ main() deformation.reinit(dof_handler_def.n_dofs()); // Project solution onto RT FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, hn_constraints); hn_constraints.close(); @@ -375,7 +375,7 @@ main() dof_handler, hn_constraints, QGauss<2>(6), TestMap1<2>(2), solution); // Project reference solution onto RT FE field - ConstraintMatrix hn_constraints_def; + AffineConstraints hn_constraints_def; hn_constraints_def.clear(); DoFTools::make_hanging_node_constraints(dof_handler_def, hn_constraints_def); hn_constraints_def.close(); diff --git a/tests/fail/step-15.cc b/tests/fail/step-15.cc index b890029db0..6c148a0d69 100644 --- a/tests/fail/step-15.cc +++ b/tests/fail/step-15.cc @@ -126,7 +126,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix matrix; diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 77a6cba792..2b788cf734 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -426,15 +426,15 @@ create_right_hand_side(const Mapping & mapping, template void -project(const Mapping & mapping, - const DoFHandler & dof, - const ConstraintMatrix &constraints, - const Quadrature & quadrature, - const Function & function, - Vector & vec, - const bool enforce_zero_boundary = false, - const Quadrature & = QGauss(2), - const bool project_to_boundary_first = false) +project(const Mapping & mapping, + const DoFHandler & dof, + const AffineConstraints &constraints, + const Quadrature & quadrature, + const Function & function, + Vector & vec, + const bool enforce_zero_boundary = false, + const Quadrature & = QGauss(2), + const bool project_to_boundary_first = false) { Assert(dof.get_fe().n_components() == function.n_components, ExcInternalError()); @@ -630,7 +630,7 @@ main(int /*argc*/, char ** /*argv*/) solution = 1; // Project solution onto FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints); hn_constraints.close(); diff --git a/tests/fe/abf_02.cc b/tests/fe/abf_02.cc index 7218a84fed..ccbee14a3d 100644 --- a/tests/fe/abf_02.cc +++ b/tests/fe/abf_02.cc @@ -407,15 +407,15 @@ create_right_hand_side(const Mapping & mapping, template void -project(const Mapping & mapping, - const DoFHandler & dof, - const ConstraintMatrix &constraints, - const Quadrature & quadrature, - const Function & function, - Vector & vec, - const bool enforce_zero_boundary = false, - const Quadrature & = QGauss(2), - const bool project_to_boundary_first = false) +project(const Mapping & mapping, + const DoFHandler & dof, + const AffineConstraints &constraints, + const Quadrature & quadrature, + const Function & function, + Vector & vec, + const bool enforce_zero_boundary = false, + const Quadrature & = QGauss(2), + const bool project_to_boundary_first = false) { Assert(dof.get_fe().n_components() == function.n_components, ExcInternalError()); @@ -538,7 +538,7 @@ main() solution = 1; // Project solution onto FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, hn_constraints); hn_constraints.close(); diff --git a/tests/fe/crash_01.cc b/tests/fe/crash_01.cc index a1c77254a2..fb9aae88f5 100644 --- a/tests/fe/crash_01.cc +++ b/tests/fe/crash_01.cc @@ -82,7 +82,7 @@ test(FiniteElement &fe) tria.refine_global(1); DoFHandler dof_handler(tria); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; Functions::ZeroFunction boundary_values(fe.n_components()); VectorTools::project_boundary_values_curl_conforming( dof_handler, 0, boundary_values, 0, constraints); diff --git a/tests/fe/curl_curl_01.cc b/tests/fe/curl_curl_01.cc index f4914d05e1..a7d0dd1738 100644 --- a/tests/fe/curl_curl_01.cc +++ b/tests/fe/curl_curl_01.cc @@ -91,15 +91,15 @@ private: void solve(); void - process_solution(const unsigned int cycle); - Triangulation triangulation; - DoFHandler dof_handler; - FE_Nedelec fe; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + process_solution(const unsigned int cycle); + Triangulation triangulation; + DoFHandler dof_handler; + FE_Nedelec fe; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; unsigned int p_order; unsigned int quad_order; diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index 5f650ad1da..735a464ae8 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -480,16 +480,16 @@ create_right_hand_side(const Mapping & mapping, template void -project(const Mapping & mapping, - const DoFHandler & dof, - const ConstraintMatrix &constraints, - const Quadrature & quadrature, - const Function & function, - Vector & vec, - const unsigned int min_convergence_steps, - const bool enforce_zero_boundary = false, - const Quadrature & = QGauss(2), - const bool project_to_boundary_first = false) +project(const Mapping & mapping, + const DoFHandler & dof, + const AffineConstraints &constraints, + const Quadrature & quadrature, + const Function & function, + Vector & vec, + const unsigned int min_convergence_steps, + const bool enforce_zero_boundary = false, + const Quadrature & = QGauss(2), + const bool project_to_boundary_first = false) { Assert(dof.get_fe().n_components() == function.n_components, ExcInternalError()); @@ -739,7 +739,7 @@ check(const FiniteElement<2> & fe, Vector solution(dof_handler->n_dofs()); // Project solution onto FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints); hn_constraints.close(); diff --git a/tests/fe/fe_enriched_05.cc b/tests/fe/fe_enriched_05.cc index 5e9dbfd46f..efd756ec2d 100644 --- a/tests/fe/fe_enriched_05.cc +++ b/tests/fe/fe_enriched_05.cc @@ -101,7 +101,7 @@ test4() dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_enriched_07.cc b/tests/fe/fe_enriched_07.cc index 6bd3ee04e8..78515622cf 100644 --- a/tests/fe/fe_enriched_07.cc +++ b/tests/fe/fe_enriched_07.cc @@ -131,7 +131,7 @@ test6(const bool do_href, deallog << "n_cells: " << triangulation.n_active_cells() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_enriched_08.cc b/tests/fe/fe_enriched_08.cc index b0d8b33b64..b079bba237 100644 --- a/tests/fe/fe_enriched_08.cc +++ b/tests/fe/fe_enriched_08.cc @@ -119,7 +119,7 @@ test2cells(const unsigned int p_feq = 2, const unsigned int p_feen = 1) dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_enriched_08a.cc b/tests/fe/fe_enriched_08a.cc index 07d4796e25..42812d1e84 100644 --- a/tests/fe/fe_enriched_08a.cc +++ b/tests/fe/fe_enriched_08a.cc @@ -86,7 +86,7 @@ test2cellsFESystem(const unsigned int p_feq = 2, const unsigned int p_feen = 1) dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_enriched_step-36.cc b/tests/fe/fe_enriched_step-36.cc index 81c5c57715..b32b45f361 100644 --- a/tests/fe/fe_enriched_step-36.cc +++ b/tests/fe/fe_enriched_step-36.cc @@ -182,7 +182,7 @@ namespace Step36 std::vector eigenvalues; PETScWrappers::MPI::SparseMatrix stiffness_matrix, mass_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; MPI_Comm mpi_communicator; const unsigned int n_mpi_processes; diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc index 37f46fc3dd..92b339dbaa 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -188,7 +188,7 @@ namespace Step36 std::vector eigenvalues; PETScWrappers::MPI::SparseMatrix stiffness_matrix, mass_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; MPI_Comm mpi_communicator; const unsigned int n_mpi_processes; diff --git a/tests/fe/fe_face_orientation_nedelec.h b/tests/fe/fe_face_orientation_nedelec.h index b4f6b1c9a1..fafbf541f2 100644 --- a/tests/fe/fe_face_orientation_nedelec.h +++ b/tests/fe/fe_face_orientation_nedelec.h @@ -235,7 +235,7 @@ set_solution(Vector & vector, const DoFHandler<3> & dof_handler_ref, const Vector &u_ref) { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); diff --git a/tests/fe/fe_face_orientation_nedelec_0.cc b/tests/fe/fe_face_orientation_nedelec_0.cc index 139cc17bd0..26b0ef65c9 100644 --- a/tests/fe/fe_face_orientation_nedelec_0.cc +++ b/tests/fe/fe_face_orientation_nedelec_0.cc @@ -152,7 +152,7 @@ set_solution(Vector & vector, const DoFHandler<3> & dof_handler_ref, const Vector &u_ref) { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); diff --git a/tests/fe/fe_nedelec_sz_non_rect_2d.cc b/tests/fe/fe_nedelec_sz_non_rect_2d.cc index 0a5f280acc..7ced94da2e 100644 --- a/tests/fe/fe_nedelec_sz_non_rect_2d.cc +++ b/tests/fe/fe_nedelec_sz_non_rect_2d.cc @@ -151,14 +151,14 @@ namespace polytest unsigned int p_order; unsigned int quad_order; - Triangulation tria; - DoFHandler dof_handler; - FE_NedelecSZ fe; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + Triangulation tria; + DoFHandler dof_handler; + FE_NedelecSZ fe; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; }; template diff --git a/tests/fe/fe_nedelec_sz_non_rect_face.cc b/tests/fe/fe_nedelec_sz_non_rect_face.cc index d6dc592431..998c3f73af 100644 --- a/tests/fe/fe_nedelec_sz_non_rect_face.cc +++ b/tests/fe/fe_nedelec_sz_non_rect_face.cc @@ -166,15 +166,15 @@ namespace Maxwell double calcErrorHcurlNorm(); - Triangulation triangulation; - MappingQ mapping; - DoFHandler dof_handler; - FE_NedelecSZ fe; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + Triangulation triangulation; + MappingQ mapping; + DoFHandler dof_handler; + FE_NedelecSZ fe; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; ConvergenceTable convergence_table; diff --git a/tests/fe/fe_nothing.cc b/tests/fe/fe_nothing.cc index cc7a452901..aad575ebb5 100644 --- a/tests/fe/fe_nothing.cc +++ b/tests/fe/fe_nothing.cc @@ -56,7 +56,7 @@ test2cells(const unsigned int p1 = 2, const unsigned int p2 = 1) dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_project_2d.cc b/tests/fe/fe_project_2d.cc index cd4b951725..79e05fb9dd 100644 --- a/tests/fe/fe_project_2d.cc +++ b/tests/fe/fe_project_2d.cc @@ -187,7 +187,7 @@ test(const FiniteElement &fe, { dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_project_3d.cc b/tests/fe/fe_project_3d.cc index f715e5c50f..7878cfc8ec 100644 --- a/tests/fe/fe_project_3d.cc +++ b/tests/fe/fe_project_3d.cc @@ -257,7 +257,7 @@ test(const FiniteElement &fe, { dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc index 0f8c879e84..4b3375f4d7 100644 --- a/tests/fe/fe_q_dg0.cc +++ b/tests/fe/fe_q_dg0.cc @@ -108,7 +108,7 @@ namespace Step22 FESystem & fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; diff --git a/tests/fe/fe_tools_test.cc b/tests/fe/fe_tools_test.cc index 6932895923..e4f975f01e 100644 --- a/tests/fe/fe_tools_test.cc +++ b/tests/fe/fe_tools_test.cc @@ -115,11 +115,11 @@ test(const Triangulation &tria, Vector function1_back(dof_handler1.n_dofs()); Vector function2(dof_handler2.n_dofs()); - ConstraintMatrix constraints1; + AffineConstraints constraints1; DoFTools::make_hanging_node_constraints(dof_handler1, constraints1); constraints1.close(); - ConstraintMatrix constraints2; + AffineConstraints constraints2; DoFTools::make_hanging_node_constraints(dof_handler2, constraints2); constraints2.close(); diff --git a/tests/fe/fe_values_function_manifold.cc b/tests/fe/fe_values_function_manifold.cc index 995ece2dba..5f62e4c837 100644 --- a/tests/fe/fe_values_function_manifold.cc +++ b/tests/fe/fe_values_function_manifold.cc @@ -225,11 +225,11 @@ protected: QGauss cell_quadrature; MappingQGeneric cell_mapping; - ConstraintMatrix all_constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector system_rhs; - Vector solution; + AffineConstraints all_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector system_rhs; + Vector solution; void setup_dofs(); diff --git a/tests/fe/fe_values_view_28.cc b/tests/fe/fe_values_view_28.cc index dc108f9c5d..805a8321ed 100644 --- a/tests/fe/fe_values_view_28.cc +++ b/tests/fe/fe_values_view_28.cc @@ -85,7 +85,7 @@ test(const Triangulation &tr, const FiniteElement &fe) Vector fe_function(dof.n_dofs()); // set the elements of the vector in such a way that the function // equals the vector function (0,x^2) - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dof, cm, QGauss<2>(4), F(), fe_function); diff --git a/tests/fe/fe_values_view_29.cc b/tests/fe/fe_values_view_29.cc index 0e67282b34..78ee65b918 100644 --- a/tests/fe/fe_values_view_29.cc +++ b/tests/fe/fe_values_view_29.cc @@ -87,7 +87,7 @@ test(const Triangulation &tr, Vector fe_function(dof.n_dofs()); // set the elements of the vector in such a way that the function // equals the vector function (0,x^2) - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dof, cm, QGauss<2>(2 + degree), F(), fe_function); diff --git a/tests/fe/fe_values_view_30.cc b/tests/fe/fe_values_view_30.cc index c87dbdd061..7b884a22be 100644 --- a/tests/fe/fe_values_view_30.cc +++ b/tests/fe/fe_values_view_30.cc @@ -127,7 +127,7 @@ test(const Triangulation &tr, const FiniteElement &fe) update_values | update_gradients | update_3rd_derivatives); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc index 398c9dc962..b94eccb76f 100644 --- a/tests/fe/nedelec_2.cc +++ b/tests/fe/nedelec_2.cc @@ -90,7 +90,7 @@ plot(const Triangulation &tr, const unsigned int p) FE_Nedelec fe_ned(p); DoFHandler dof(tr); dof.distribute_dofs(fe_ned); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof, cm); cm.close(); diff --git a/tests/fe/nedelec_crash_01.cc b/tests/fe/nedelec_crash_01.cc index c467103e06..fbba6e7f51 100644 --- a/tests/fe/nedelec_crash_01.cc +++ b/tests/fe/nedelec_crash_01.cc @@ -53,7 +53,7 @@ main() DoFHandler<3> dof(tr); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/fe/nedelec_crash_hp.cc b/tests/fe/nedelec_crash_hp.cc index bc13920f81..2e73a59b35 100644 --- a/tests/fe/nedelec_crash_hp.cc +++ b/tests/fe/nedelec_crash_hp.cc @@ -96,7 +96,7 @@ test() dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/fe/nedelec_non_rect_2d.cc b/tests/fe/nedelec_non_rect_2d.cc index 72b7ab6e5d..e3155d0dd0 100644 --- a/tests/fe/nedelec_non_rect_2d.cc +++ b/tests/fe/nedelec_non_rect_2d.cc @@ -149,14 +149,14 @@ namespace polytest unsigned int p_order; unsigned int quad_order; - Triangulation tria; - DoFHandler dof_handler; - FE_Nedelec fe; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + Triangulation tria; + DoFHandler dof_handler; + FE_Nedelec fe; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; }; template diff --git a/tests/fe/nedelec_non_rect_face.cc b/tests/fe/nedelec_non_rect_face.cc index a52dfcb0d7..5b4e7b3127 100644 --- a/tests/fe/nedelec_non_rect_face.cc +++ b/tests/fe/nedelec_non_rect_face.cc @@ -167,15 +167,15 @@ namespace Maxwell double calcErrorHcurlNorm(); - Triangulation triangulation; - MappingQ mapping; - DoFHandler dof_handler; - FE_Nedelec fe; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + Triangulation triangulation; + MappingQ mapping; + DoFHandler dof_handler; + FE_Nedelec fe; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + Vector solution; + Vector system_rhs; ConvergenceTable convergence_table; diff --git a/tests/fe/rt_approximation_01.cc b/tests/fe/rt_approximation_01.cc index 4b44d30c11..06b224d3d9 100644 --- a/tests/fe/rt_approximation_01.cc +++ b/tests/fe/rt_approximation_01.cc @@ -354,7 +354,7 @@ double TestProjection(Mapping<2> &mapping, DoFHandler<2> *dof_handler) TestPoly<2> pol(deg); // Project solution onto RT FE field - ConstraintMatrix hn_constraints; + AffineConstraints hn_constraints; hn_constraints.clear(); DoFTools::make_hanging_node_constraints(*dof_handler, hn_constraints); hn_constraints.close(); @@ -463,7 +463,7 @@ main() solution_q.reinit(dof_handler->n_dofs()); deformation.reinit(dof_handler_def->n_dofs()); - ConstraintMatrix hn_constraints_def; + AffineConstraints hn_constraints_def; hn_constraints_def.clear(); DoFTools::make_hanging_node_constraints(*dof_handler_def, hn_constraints_def); hn_constraints_def.close(); diff --git a/tests/gla/block_mat_02.cc b/tests/gla/block_mat_02.cc index 49a96f359e..535ff8d8a8 100644 --- a/tests/gla/block_mat_02.cc +++ b/tests/gla/block_mat_02.cc @@ -100,7 +100,7 @@ test() stokes_relevant_set.print(deallog.get_file_stream()); - ConstraintMatrix cm(stokes_relevant_set); + AffineConstraints cm(stokes_relevant_set); DoFTools::make_hanging_node_constraints(stokes_dof_handler, cm); @@ -196,7 +196,7 @@ test_LA_Trilinos() stokes_relevant_set.get_view(n_u, n_u + n_p)); stokes_relevant_set.print(deallog.get_file_stream()); - ConstraintMatrix cm(stokes_relevant_set); + AffineConstraints cm(stokes_relevant_set); DoFTools::make_hanging_node_constraints(stokes_dof_handler, cm); diff --git a/tests/gla/block_mat_03.cc b/tests/gla/block_mat_03.cc index 92e8ea0d96..16d22ac926 100644 --- a/tests/gla/block_mat_03.cc +++ b/tests/gla/block_mat_03.cc @@ -208,7 +208,7 @@ test_alt() locally_relevant_dofs.print(deallog); - ConstraintMatrix constraints(locally_relevant_dofs); + AffineConstraints constraints(locally_relevant_dofs); constraints.close(); TrilinosWrappers::BlockSparsityPattern sp(locally_owned_partitioning, diff --git a/tests/gla/block_vec_02.cc b/tests/gla/block_vec_02.cc index 0a6a2536ab..aec9f7d5b0 100644 --- a/tests/gla/block_vec_02.cc +++ b/tests/gla/block_vec_02.cc @@ -15,7 +15,7 @@ -// block vectors: test ConstraintMatrix::distribute (fails currently) +// block vectors: test AffineConstraints::distribute (fails currently) #include diff --git a/tests/gla/mat_03.cc b/tests/gla/mat_03.cc index 3a5d96b902..dcb913c113 100644 --- a/tests/gla/mat_03.cc +++ b/tests/gla/mat_03.cc @@ -16,7 +16,7 @@ // document bug in assembling a LA::MPI::SparseMatrix -// this was due to handing a wrong IndexSet to the ConstraintMatrix +// this was due to handing a wrong IndexSet to the AffineConstraints #include @@ -51,7 +51,7 @@ test() if (myid == 0) deallog << "numproc=" << numproc << std::endl; - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); parallel::distributed::Triangulation triangulation( diff --git a/tests/gla/mat_04.cc b/tests/gla/mat_04.cc index f288707a57..133fe1fc7c 100644 --- a/tests/gla/mat_04.cc +++ b/tests/gla/mat_04.cc @@ -52,7 +52,7 @@ test() if (myid == 0) deallog << "numproc=" << numproc << std::endl; - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); parallel::distributed::Triangulation triangulation( @@ -113,7 +113,7 @@ test_trilinos_alternative() if (myid == 0) deallog << "numproc=" << numproc << std::endl; - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); parallel::distributed::Triangulation triangulation( diff --git a/tests/grid/grid_parallelepiped_04.cc b/tests/grid/grid_parallelepiped_04.cc index ecb62dfb22..89ac251cfd 100644 --- a/tests/grid/grid_parallelepiped_04.cc +++ b/tests/grid/grid_parallelepiped_04.cc @@ -124,8 +124,8 @@ check_parallelepiped(bool colorize, bool log, const unsigned int (&subd)[dim]) dh.distribute_dofs(fe); DataOut d_o; d_o.attach_dof_handler(dh); - Vector vec(dh.n_dofs()); - ConstraintMatrix constraints; + Vector vec(dh.n_dofs()); + AffineConstraints constraints; for (unsigned int c = 0; c < 6; ++c) VectorTools::interpolate_boundary_values( dh, c, Functions::ConstantFunction(c), constraints); diff --git a/tests/grid/intergrid_constraints.cc b/tests/grid/intergrid_constraints.cc index a15305993e..913b007c59 100644 --- a/tests/grid/intergrid_constraints.cc +++ b/tests/grid/intergrid_constraints.cc @@ -115,7 +115,7 @@ check() // now compute intergrid constraints InterGridMap> intergrid_map; intergrid_map.make_mapping(dof_1, dof_2); - ConstraintMatrix intergrid_constraints; + AffineConstraints intergrid_constraints; if (dim != 3) { diff --git a/tests/hp/crash_06.cc b/tests/hp/crash_06.cc index f900dd7a1f..5fdc48e4b5 100644 --- a/tests/hp/crash_06.cc +++ b/tests/hp/crash_06.cc @@ -80,7 +80,7 @@ do_check(const Triangulation & triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_07.cc b/tests/hp/crash_07.cc index b032680057..7b9edc2526 100644 --- a/tests/hp/crash_07.cc +++ b/tests/hp/crash_07.cc @@ -136,7 +136,7 @@ main() } - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_08.cc b/tests/hp/crash_08.cc index 17d0c345e2..7cbbe57313 100644 --- a/tests/hp/crash_08.cc +++ b/tests/hp/crash_08.cc @@ -148,7 +148,7 @@ main() dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_09.cc b/tests/hp/crash_09.cc index 501c01f9c4..5701e66584 100644 --- a/tests/hp/crash_09.cc +++ b/tests/hp/crash_09.cc @@ -147,7 +147,7 @@ main() } done: - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_10.cc b/tests/hp/crash_10.cc index 167105a1b9..0a7bd2b563 100644 --- a/tests/hp/crash_10.cc +++ b/tests/hp/crash_10.cc @@ -43,10 +43,10 @@ template void test() { - Triangulation triangulation; - hp::FECollection fe; - hp::DoFHandler dof_handler(triangulation); - ConstraintMatrix hanging_node_constraints; + Triangulation triangulation; + hp::FECollection fe; + hp::DoFHandler dof_handler(triangulation); + AffineConstraints hanging_node_constraints; FE_Q fe_1(1), fe_2(2), fe_3(QIterated<1>(QTrapez<1>(), 3)), fe_4(QIterated<1>(QTrapez<1>(), 4)); diff --git a/tests/hp/crash_11.cc b/tests/hp/crash_11.cc index 9522ecf536..af5008c1f9 100644 --- a/tests/hp/crash_11.cc +++ b/tests/hp/crash_11.cc @@ -134,7 +134,7 @@ main() } done: - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_12.cc b/tests/hp/crash_12.cc index db25fe29b1..1a738df6d8 100644 --- a/tests/hp/crash_12.cc +++ b/tests/hp/crash_12.cc @@ -104,7 +104,7 @@ test() dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc index 98e7788f7a..3a16a026d0 100644 --- a/tests/hp/crash_17.cc +++ b/tests/hp/crash_17.cc @@ -96,7 +96,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index bbeb4a033b..ebf0e0d0ac 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -99,7 +99,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/crash_21.cc b/tests/hp/crash_21.cc index 8196e39e4a..d88bb4a127 100644 --- a/tests/hp/crash_21.cc +++ b/tests/hp/crash_21.cc @@ -74,7 +74,7 @@ namespace Step hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/create_laplace_matrix_01.cc b/tests/hp/create_laplace_matrix_01.cc index 8222eaacb6..016e6ddbdc 100644 --- a/tests/hp/create_laplace_matrix_01.cc +++ b/tests/hp/create_laplace_matrix_01.cc @@ -100,7 +100,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_01b.cc b/tests/hp/create_laplace_matrix_01b.cc index aba4b74dbc..b68d10851b 100644 --- a/tests/hp/create_laplace_matrix_01b.cc +++ b/tests/hp/create_laplace_matrix_01b.cc @@ -101,7 +101,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_02.cc b/tests/hp/create_laplace_matrix_02.cc index 5e24b7c997..2bee72ea8d 100644 --- a/tests/hp/create_laplace_matrix_02.cc +++ b/tests/hp/create_laplace_matrix_02.cc @@ -107,7 +107,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_02b.cc b/tests/hp/create_laplace_matrix_02b.cc index b9ec1133e7..cb3a493879 100644 --- a/tests/hp/create_laplace_matrix_02b.cc +++ b/tests/hp/create_laplace_matrix_02b.cc @@ -108,7 +108,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_03.cc b/tests/hp/create_laplace_matrix_03.cc index 07eee2d946..0eba53d967 100644 --- a/tests/hp/create_laplace_matrix_03.cc +++ b/tests/hp/create_laplace_matrix_03.cc @@ -100,7 +100,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_03b.cc b/tests/hp/create_laplace_matrix_03b.cc index 05c10d368c..dadabc2dcc 100644 --- a/tests/hp/create_laplace_matrix_03b.cc +++ b/tests/hp/create_laplace_matrix_03b.cc @@ -101,7 +101,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_04.cc b/tests/hp/create_laplace_matrix_04.cc index caf48b8e2b..4292b80bc2 100644 --- a/tests/hp/create_laplace_matrix_04.cc +++ b/tests/hp/create_laplace_matrix_04.cc @@ -107,7 +107,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_04b.cc b/tests/hp/create_laplace_matrix_04b.cc index ece342a37d..116fc56305 100644 --- a/tests/hp/create_laplace_matrix_04b.cc +++ b/tests/hp/create_laplace_matrix_04b.cc @@ -108,7 +108,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_laplace_matrix_constraints_02.cc b/tests/hp/create_laplace_matrix_constraints_02.cc index c71de9e320..d4d16ee4e6 100644 --- a/tests/hp/create_laplace_matrix_constraints_02.cc +++ b/tests/hp/create_laplace_matrix_constraints_02.cc @@ -88,7 +88,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/hp/create_laplace_matrix_constraints_02b.cc b/tests/hp/create_laplace_matrix_constraints_02b.cc index 322e021cae..f119709809 100644 --- a/tests/hp/create_laplace_matrix_constraints_02b.cc +++ b/tests/hp/create_laplace_matrix_constraints_02b.cc @@ -88,7 +88,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/hp/create_mass_matrix_01.cc b/tests/hp/create_mass_matrix_01.cc index bbea846f7c..77200dce17 100644 --- a/tests/hp/create_mass_matrix_01.cc +++ b/tests/hp/create_mass_matrix_01.cc @@ -100,7 +100,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_01b.cc b/tests/hp/create_mass_matrix_01b.cc index 894e7453c6..8738b57ad3 100644 --- a/tests/hp/create_mass_matrix_01b.cc +++ b/tests/hp/create_mass_matrix_01b.cc @@ -101,7 +101,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_02.cc b/tests/hp/create_mass_matrix_02.cc index 4632356f8a..e8b7d1b669 100644 --- a/tests/hp/create_mass_matrix_02.cc +++ b/tests/hp/create_mass_matrix_02.cc @@ -107,7 +107,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_02b.cc b/tests/hp/create_mass_matrix_02b.cc index 9e2360859f..4c9158c9d7 100644 --- a/tests/hp/create_mass_matrix_02b.cc +++ b/tests/hp/create_mass_matrix_02b.cc @@ -108,7 +108,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_03.cc b/tests/hp/create_mass_matrix_03.cc index 30354049b8..bb015547e7 100644 --- a/tests/hp/create_mass_matrix_03.cc +++ b/tests/hp/create_mass_matrix_03.cc @@ -100,7 +100,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_03b.cc b/tests/hp/create_mass_matrix_03b.cc index ad38f35c90..12b7cc614b 100644 --- a/tests/hp/create_mass_matrix_03b.cc +++ b/tests/hp/create_mass_matrix_03b.cc @@ -103,7 +103,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_04.cc b/tests/hp/create_mass_matrix_04.cc index 42ad3ff07e..182760d267 100644 --- a/tests/hp/create_mass_matrix_04.cc +++ b/tests/hp/create_mass_matrix_04.cc @@ -107,7 +107,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_04b.cc b/tests/hp/create_mass_matrix_04b.cc index 10d50e7841..afda482723 100644 --- a/tests/hp/create_mass_matrix_04b.cc +++ b/tests/hp/create_mass_matrix_04b.cc @@ -108,7 +108,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_05.cc b/tests/hp/create_mass_matrix_05.cc index 773b1c4254..2b26917c03 100644 --- a/tests/hp/create_mass_matrix_05.cc +++ b/tests/hp/create_mass_matrix_05.cc @@ -107,7 +107,7 @@ check() mask[dim + i][dim + j] = DoFTools::always; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/create_mass_matrix_constraints_02.cc b/tests/hp/create_mass_matrix_constraints_02.cc index b95769f545..f78fe7ba85 100644 --- a/tests/hp/create_mass_matrix_constraints_02.cc +++ b/tests/hp/create_mass_matrix_constraints_02.cc @@ -88,7 +88,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/hp/create_mass_matrix_constraints_02b.cc b/tests/hp/create_mass_matrix_constraints_02b.cc index bfa492389d..ca526172f6 100644 --- a/tests/hp/create_mass_matrix_constraints_02b.cc +++ b/tests/hp/create_mass_matrix_constraints_02b.cc @@ -88,7 +88,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/hp/face_domination_01.cc b/tests/hp/face_domination_01.cc index 99a0ed3181..876182910f 100644 --- a/tests/hp/face_domination_01.cc +++ b/tests/hp/face_domination_01.cc @@ -82,7 +82,7 @@ main() print_dofs(dof_handler.begin_active()); print_dofs(++dof_handler.begin_active()); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/face_domination_02.cc b/tests/hp/face_domination_02.cc index a1105dae95..a17fdefb6e 100644 --- a/tests/hp/face_domination_02.cc +++ b/tests/hp/face_domination_02.cc @@ -84,7 +84,7 @@ main() print_dofs(dof_handler.begin_active()); print_dofs(++dof_handler.begin_active()); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/face_domination_04.cc b/tests/hp/face_domination_04.cc index 4b1ce3f5f2..2433d0604d 100644 --- a/tests/hp/face_domination_04.cc +++ b/tests/hp/face_domination_04.cc @@ -91,7 +91,7 @@ main() print_dofs(dof_handler.begin_active()); print_dofs(++dof_handler.begin_active()); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/fe_nothing_03.cc b/tests/hp/fe_nothing_03.cc index a2fb14dcb0..a15b81a304 100644 --- a/tests/hp/fe_nothing_03.cc +++ b/tests/hp/fe_nothing_03.cc @@ -86,7 +86,7 @@ test() // .... test constraint handling - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_05.cc b/tests/hp/fe_nothing_05.cc index b03d62019a..6066d23788 100644 --- a/tests/hp/fe_nothing_05.cc +++ b/tests/hp/fe_nothing_05.cc @@ -136,7 +136,7 @@ test() // .... test constraint handling - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_06.cc b/tests/hp/fe_nothing_06.cc index 3746278f33..c525e421a0 100644 --- a/tests/hp/fe_nothing_06.cc +++ b/tests/hp/fe_nothing_06.cc @@ -138,7 +138,7 @@ test() // .... test constraint handling - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_07.cc b/tests/hp/fe_nothing_07.cc index ccd48f0fb8..cb3f8f5d0e 100644 --- a/tests/hp/fe_nothing_07.cc +++ b/tests/hp/fe_nothing_07.cc @@ -144,7 +144,7 @@ test() // .... test constraint handling - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_12.cc b/tests/hp/fe_nothing_12.cc index 6fd8e6bf06..f65bfde681 100644 --- a/tests/hp/fe_nothing_12.cc +++ b/tests/hp/fe_nothing_12.cc @@ -84,7 +84,7 @@ test() dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_13.cc b/tests/hp/fe_nothing_13.cc index 643c8d1f15..140b10c504 100644 --- a/tests/hp/fe_nothing_13.cc +++ b/tests/hp/fe_nothing_13.cc @@ -89,7 +89,7 @@ test() dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_14.cc b/tests/hp/fe_nothing_14.cc index a3d52b6722..262a639c8a 100644 --- a/tests/hp/fe_nothing_14.cc +++ b/tests/hp/fe_nothing_14.cc @@ -102,7 +102,7 @@ test() dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/hp/fe_nothing_17.cc b/tests/hp/fe_nothing_17.cc index 7a8bb687aa..c01e005b29 100644 --- a/tests/hp/fe_nothing_17.cc +++ b/tests/hp/fe_nothing_17.cc @@ -55,8 +55,8 @@ transfer(std::ostream &out) FESystem fe(FE_Q(1), 1, FE_Nothing(), 1); DoFHandler dof_handler(tria); - Vector solution; - ConstraintMatrix cm; + Vector solution; + AffineConstraints cm; cm.close(); dof_handler.distribute_dofs(fe); diff --git a/tests/hp/fe_nothing_18.cc b/tests/hp/fe_nothing_18.cc index 5550022313..e58e6d5ba4 100644 --- a/tests/hp/fe_nothing_18.cc +++ b/tests/hp/fe_nothing_18.cc @@ -105,9 +105,10 @@ private: hp::FECollection fe; // used to stack several other elements together to // form one vector-valued finite element. - ConstraintMatrix hanging_node_constraints; // object to hold hanging node - // constraints after refinement - ConstraintMatrix constraints; + AffineConstraints + hanging_node_constraints; // object to hold hanging node + // constraints after refinement + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; // store sparsity pattern diff --git a/tests/hp/fe_nothing_19.cc b/tests/hp/fe_nothing_19.cc index be732ea02e..dfc50eedb7 100644 --- a/tests/hp/fe_nothing_19.cc +++ b/tests/hp/fe_nothing_19.cc @@ -69,7 +69,7 @@ test() deallog << std::endl; } - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; DoFTools::make_hanging_node_constraints(dof_handler, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/hp/hp_constraints_common.h b/tests/hp/hp_constraints_common.h index 35e24e2d33..73b13df47a 100644 --- a/tests/hp/hp_constraints_common.h +++ b/tests/hp/hp_constraints_common.h @@ -79,7 +79,7 @@ do_check(const Triangulation & triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); @@ -381,7 +381,7 @@ test_interpolation_base(const hp::FECollection & fe, dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/hp_constraints_common_no_support.h b/tests/hp/hp_constraints_common_no_support.h index 49e8036109..1aa7be3f69 100644 --- a/tests/hp/hp_constraints_common_no_support.h +++ b/tests/hp/hp_constraints_common_no_support.h @@ -80,7 +80,7 @@ do_check(const Triangulation & triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); @@ -377,7 +377,7 @@ test_interpolation_base(const hp::FECollection & fe, dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/hp_constraints_neither_dominate_01.cc b/tests/hp/hp_constraints_neither_dominate_01.cc index 4b5a2619eb..6370f7414d 100644 --- a/tests/hp/hp_constraints_neither_dominate_01.cc +++ b/tests/hp/hp_constraints_neither_dominate_01.cc @@ -112,7 +112,7 @@ test2cells(const unsigned int p1 = 2, const unsigned int p2 = 1) dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/hp_constraints_neither_dominate_02.cc b/tests/hp/hp_constraints_neither_dominate_02.cc index fd8f68e8e5..cde6113613 100644 --- a/tests/hp/hp_constraints_neither_dominate_02.cc +++ b/tests/hp/hp_constraints_neither_dominate_02.cc @@ -159,7 +159,7 @@ test2cells(const FiniteElement &fe_0, } dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc index 7b93f2d5ac..2e860cd4be 100644 --- a/tests/hp/hp_hanging_nodes_01.cc +++ b/tests/hp/hp_hanging_nodes_01.cc @@ -112,7 +112,7 @@ test_constraints(hp::FECollection &fe_coll) deallog << "DoFs: " << dof_handler.n_dofs() << std::endl; // Create the constraints. - ConstraintMatrix constraint_matrix; + AffineConstraints constraint_matrix; DoFTools::make_hanging_node_constraints(dof_handler, constraint_matrix); @@ -146,7 +146,7 @@ test_constraints_old(FiniteElement &fe) deallog << "DoFs: " << dof_handler.n_dofs() << std::endl; // Create the constraints. - ConstraintMatrix constraint_matrix; + AffineConstraints constraint_matrix; DoFTools::make_hanging_node_constraints(dof_handler, constraint_matrix); diff --git a/tests/hp/hp_hanging_nodes_02.cc b/tests/hp/hp_hanging_nodes_02.cc index 4291ffeddb..52dcc7fa0d 100644 --- a/tests/hp/hp_hanging_nodes_02.cc +++ b/tests/hp/hp_hanging_nodes_02.cc @@ -16,7 +16,7 @@ // compute hanging node constraints (before and after the processing -// we do in ConstraintMatrix::close()) for some grids with and without +// we do in AffineConstraints::close()) for some grids with and without // random distribution of FEs #include @@ -57,10 +57,10 @@ template void run(bool random_p, unsigned int *indx) { - Triangulation triangulation; - hp::FECollection fe; - hp::DoFHandler dof_handler(triangulation); - ConstraintMatrix hanging_node_constraints; + Triangulation triangulation; + hp::FECollection fe; + hp::DoFHandler dof_handler(triangulation); + AffineConstraints hanging_node_constraints; FE_Q fe_1(QIterated<1>(QTrapez<1>(), indx[0])), fe_2(QIterated<1>(QTrapez<1>(), indx[1])), diff --git a/tests/hp/hp_q_hierarchical_constraints.cc b/tests/hp/hp_q_hierarchical_constraints.cc index 27f1858787..b31e2e7330 100644 --- a/tests/hp/hp_q_hierarchical_constraints.cc +++ b/tests/hp/hp_q_hierarchical_constraints.cc @@ -52,9 +52,9 @@ test(const bool apply_constrains, const unsigned int hp) triangulation); } - hp::FECollection fe; - hp::DoFHandler dof_handler(triangulation); - ConstraintMatrix constraints; // for boundary conditions + hp::FECollection fe; + hp::DoFHandler dof_handler(triangulation); + AffineConstraints constraints; // for boundary conditions // populate fe system: diff --git a/tests/hp/interpolate_dgq_02.cc b/tests/hp/interpolate_dgq_02.cc index aac7d0d631..0d63b05649 100644 --- a/tests/hp/interpolate_dgq_02.cc +++ b/tests/hp/interpolate_dgq_02.cc @@ -88,7 +88,7 @@ test() hp::DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(hp_fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/interpolate_q_02.cc b/tests/hp/interpolate_q_02.cc index 22c38bf4ad..b81f05e22e 100644 --- a/tests/hp/interpolate_q_02.cc +++ b/tests/hp/interpolate_q_02.cc @@ -88,7 +88,7 @@ test() hp::DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(hp_fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/interpolate_q_system_02.cc b/tests/hp/interpolate_q_system_02.cc index e21196ecbc..d3373f22d5 100644 --- a/tests/hp/interpolate_q_system_02.cc +++ b/tests/hp/interpolate_q_system_02.cc @@ -94,7 +94,7 @@ test() hp::DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(hp_fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc index 731a48bd4e..1e02295103 100644 --- a/tests/hp/matrices.cc +++ b/tests/hp/matrices.cc @@ -171,7 +171,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc index c01322a523..25b201848b 100644 --- a/tests/hp/matrices_hp.cc +++ b/tests/hp/matrices_hp.cc @@ -183,7 +183,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/hp/project_01.cc b/tests/hp/project_01.cc index db35d6aa15..0879ef64e6 100644 --- a/tests/hp/project_01.cc +++ b/tests/hp/project_01.cc @@ -77,7 +77,7 @@ test() Vector v(dh.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project( dh, cm, hp::QCollection(QGauss(3)), F(), v); diff --git a/tests/hp/project_01_curved_boundary.cc b/tests/hp/project_01_curved_boundary.cc index fb452c5106..e9f5992ddc 100644 --- a/tests/hp/project_01_curved_boundary.cc +++ b/tests/hp/project_01_curved_boundary.cc @@ -88,7 +88,7 @@ test() Vector v(dh.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); // use the implicit Q1 mapping. this will yield a zero solution diff --git a/tests/hp/project_02.cc b/tests/hp/project_02.cc index fbc2271d3a..c27b803ad7 100644 --- a/tests/hp/project_02.cc +++ b/tests/hp/project_02.cc @@ -80,7 +80,7 @@ test() v.block(1).reinit(dh.n_dofs() - dh.n_dofs() / 2); v.collect_sizes(); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project( dh, cm, hp::QCollection(QGauss(3)), F(), v); diff --git a/tests/hp/solution_transfer.cc b/tests/hp/solution_transfer.cc index a5647b5a6b..f4c606f2f1 100644 --- a/tests/hp/solution_transfer.cc +++ b/tests/hp/solution_transfer.cc @@ -124,7 +124,7 @@ transfer(std::ostream &out) dgq_dof_handler.distribute_dofs(fe_dgq); dgq_solution.reinit(dgq_dof_handler.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::interpolate(mapping, q_dof_handler, function, q_solution); VectorTools::interpolate(mapping, dgq_dof_handler, function, dgq_solution); diff --git a/tests/hp/solution_transfer_02.cc b/tests/hp/solution_transfer_02.cc index 8ef3b909ec..4ad67e2e82 100644 --- a/tests/hp/solution_transfer_02.cc +++ b/tests/hp/solution_transfer_02.cc @@ -64,8 +64,8 @@ transfer(std::ostream &out) hp::DoFHandler dof_handler(tria); dof_handler.begin(0)->child(0)->set_active_fe_index(1); - Vector solution; - ConstraintMatrix cm; + Vector solution; + AffineConstraints cm; cm.close(); dof_handler.distribute_dofs(fe); diff --git a/tests/hp/solution_transfer_12.cc b/tests/hp/solution_transfer_12.cc index 7f27e0b202..a6487ed58e 100644 --- a/tests/hp/solution_transfer_12.cc +++ b/tests/hp/solution_transfer_12.cc @@ -118,7 +118,7 @@ transfer(std::ostream &out) q_dof_handler.distribute_dofs(fe_q); q_solution.reinit(q_dof_handler.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); // interpolation is not straight forward for FE_Q_Hierarchical. diff --git a/tests/hp/step-11.cc b/tests/hp/step-11.cc index 4d0d2f42c5..3a36c118b3 100644 --- a/tests/hp/step-11.cc +++ b/tests/hp/step-11.cc @@ -76,9 +76,9 @@ private: hp::DoFHandler dof_handler; hp::MappingCollection mapping; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - ConstraintMatrix mean_value_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + AffineConstraints mean_value_constraints; Vector solution; Vector system_rhs; diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index 4ee791f1e9..fa982b6e79 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -280,10 +280,10 @@ namespace LaplaceSolver void solve(Vector &solution) const; - ConstraintMatrix hanging_node_constraints; - SparsityPattern sparsity_pattern; - SparseMatrix matrix; - Vector rhs; + AffineConstraints hanging_node_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix matrix; + Vector rhs; }; void @@ -447,7 +447,7 @@ namespace LaplaceSolver { hanging_node_constraints.clear(); - void (*mhnc_p)(const hp::DoFHandler &, ConstraintMatrix &) = + void (*mhnc_p)(const hp::DoFHandler &, AffineConstraints &) = &DoFTools::make_hanging_node_constraints; Threads::Thread<> mhnc_thread = diff --git a/tests/hp/step-27.cc b/tests/hp/step-27.cc index fd728135d6..9bb4f36505 100644 --- a/tests/hp/step-27.cc +++ b/tests/hp/step-27.cc @@ -100,7 +100,7 @@ namespace Step27 std::vector ln_k; Table> fourier_coefficients; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc index 2cfd8f2083..b1c44b8198 100644 --- a/tests/hp/step-3a.cc +++ b/tests/hp/step-3a.cc @@ -83,7 +83,7 @@ private: // Although we do not have h-refinement, // hanging nodes will inevitably appear // due to different polynomial degrees. - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; Vector solution; Vector system_rhs; diff --git a/tests/hp/step-3a_mapping_collection.cc b/tests/hp/step-3a_mapping_collection.cc index 721b39e515..25cebac443 100644 --- a/tests/hp/step-3a_mapping_collection.cc +++ b/tests/hp/step-3a_mapping_collection.cc @@ -84,7 +84,7 @@ private: // Although we do not have h-refinement, // hanging nodes will inevitably appear // due to different polynomial degrees. - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; Vector solution; Vector system_rhs; diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc index 31ccc4fb33..697747bea6 100644 --- a/tests/hp/step-3b.cc +++ b/tests/hp/step-3b.cc @@ -83,7 +83,7 @@ private: // Although we do not have h-refinement, // hanging nodes will inevitably appear // due to different polynomial degrees. - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; Vector solution; Vector system_rhs; diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc index e59fd44f1a..516d5ebb51 100644 --- a/tests/hp/step-3c.cc +++ b/tests/hp/step-3c.cc @@ -80,7 +80,7 @@ private: // Although we do not have h-refinement, // hanging nodes will inevitably appear // due to different polynomial degrees. - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; Vector solution; Vector system_rhs; diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index 5ff1cc89ac..e0be366309 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -82,7 +82,7 @@ private: hp::DoFHandler dof_handler; hp::FECollection fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 2036b7f011..62113abdb8 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -209,7 +209,7 @@ private: SmartPointer> fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index ec89801b96..80a6e340bf 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -83,7 +83,7 @@ private: hp::FECollection fe; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/integrators/assembler_simple_system_inhom_01.cc b/tests/integrators/assembler_simple_system_inhom_01.cc index a8830df3c1..dff2b7160e 100644 --- a/tests/integrators/assembler_simple_system_inhom_01.cc +++ b/tests/integrators/assembler_simple_system_inhom_01.cc @@ -483,11 +483,13 @@ RHSIntegrator::face(MeshWorker::DoFInfo &, * Main class */ template -class MeshWorkerConstraintMatrixTest +class MeshWorkerAffineConstraints Test { public: - MeshWorkerConstraintMatrixTest(const FiniteElement &fe); - ~MeshWorkerConstraintMatrixTest(); + MeshWorkerAffineConstraints + Test(const FiniteElement &fe); + ~MeshWorkerAffineConstraints + Test(); void run(); @@ -516,15 +518,16 @@ private: Vector rhs; Vector error_rhs; - ConstraintMatrix constraintsInhom; - ConstraintMatrix constraints; - ConstraintMatrix constraintsAll; + AffineConstraints constraintsInhom; + AffineConstraints constraints; + AffineConstraints constraintsAll; }; template -MeshWorkerConstraintMatrixTest::MeshWorkerConstraintMatrixTest( - const FiniteElement &fe) +MeshWorkerAffineConstraints + Test::MeshWorkerAffineConstraints + Test(const FiniteElement &fe) : mapping() , dof_handler(triangulation) , fe(fe) @@ -540,15 +543,17 @@ MeshWorkerConstraintMatrixTest::MeshWorkerConstraintMatrixTest( template -MeshWorkerConstraintMatrixTest::~MeshWorkerConstraintMatrixTest() +MeshWorkerAffineConstraints + Test::~MeshWorkerAffineConstraints + Test() { dof_handler.clear(); } template -void -MeshWorkerConstraintMatrixTest::setup_system() +void MeshWorkerAffineConstraints + Test::setup_system() { dof_handler.distribute_dofs(fe); @@ -587,8 +592,8 @@ MeshWorkerConstraintMatrixTest::setup_system() * Assemble with SystemSimple */ template -void -MeshWorkerConstraintMatrixTest::assemble_system_MeshWorker() +void MeshWorkerAffineConstraints + Test::assemble_system_MeshWorker() { MeshWorker::IntegrationInfoBox info_box; @@ -623,8 +628,8 @@ MeshWorkerConstraintMatrixTest::assemble_system_MeshWorker() * Assemble matrix and vector separately */ template -void -MeshWorkerConstraintMatrixTest::assemble_MeshWorker() +void MeshWorkerAffineConstraints + Test::assemble_MeshWorker() { MeshWorker::IntegrationInfoBox info_box; @@ -667,8 +672,8 @@ MeshWorkerConstraintMatrixTest::assemble_MeshWorker() template -void -MeshWorkerConstraintMatrixTest::createInhomConstraints() +void MeshWorkerAffineConstraints + Test::createInhomConstraints() { this->constraintsInhom.clear(); // boundary constraints @@ -701,8 +706,8 @@ MeshWorkerConstraintMatrixTest::createInhomConstraints() template -void -MeshWorkerConstraintMatrixTest::run() +void MeshWorkerAffineConstraints + Test::run() { setup_system(); createInhomConstraints(); @@ -743,13 +748,13 @@ main() FE_Q<2> fe(1); deallog.push(fe.get_name()); - MeshWorkerConstraintMatrixTest<2> test(fe); + MeshWorkerAffineConstraints Test<2> test(fe); test.run(); deallog.pop(); FE_DGQ<2> fe2(1); deallog.push(fe2.get_name()); - MeshWorkerConstraintMatrixTest<2> test2(fe2); + MeshWorkerAffineConstraints Test<2> test2(fe2); test2.run(); deallog.pop(); } diff --git a/tests/integrators/cochain_01.cc b/tests/integrators/cochain_01.cc index f883e136e4..8bf3da3c54 100644 --- a/tests/integrators/cochain_01.cc +++ b/tests/integrators/cochain_01.cc @@ -107,7 +107,7 @@ test_cochain(const Triangulation &tr, const FiniteElement &fe) dof.initialize_local_block_info(); // Initialize hanging node constraints - ConstraintMatrix constraints; + AffineConstraints constraints; // DoFTools::make_zero_boundary_constraints(dof, constraints); DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/integrators/laplacian_02.cc b/tests/integrators/laplacian_02.cc index fd3692d08e..7fd227eca5 100644 --- a/tests/integrators/laplacian_02.cc +++ b/tests/integrators/laplacian_02.cc @@ -42,7 +42,7 @@ test_boundary(const FiniteElement &fe, bool diff = false) DoFHandler dof(tr); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_zero_boundary_constraints(dof, constraints); QGauss quadrature(fe.tensor_degree() + 1); @@ -81,7 +81,7 @@ test_face(const FiniteElement &fe, bool diff = false) DoFHandler dof(tr); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_zero_boundary_constraints(dof, constraints); QGauss quadrature(fe.tensor_degree() + 1); diff --git a/tests/lac/constrained_linear_operator_01.cc b/tests/lac/constrained_linear_operator_01.cc index 658d6b2f6e..d1bd5762d6 100644 --- a/tests/lac/constrained_linear_operator_01.cc +++ b/tests/lac/constrained_linear_operator_01.cc @@ -77,10 +77,10 @@ private: void refine_grid(); - Triangulation triangulation; - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix constraints; + Triangulation triangulation; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/lac/constraint_graph.cc b/tests/lac/constraint_graph.cc index 6c010ed867..86a55e3c69 100644 --- a/tests/lac/constraint_graph.cc +++ b/tests/lac/constraint_graph.cc @@ -66,7 +66,7 @@ test() dof_handler.distribute_dofs(fe_collection); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dof_handler, cm); cm.write_dot(deallog.get_file_stream()); } diff --git a/tests/lac/constraint_graph_zero.cc b/tests/lac/constraint_graph_zero.cc index 65a9595493..ebce2023f3 100644 --- a/tests/lac/constraint_graph_zero.cc +++ b/tests/lac/constraint_graph_zero.cc @@ -33,7 +33,7 @@ void test() { - ConstraintMatrix cm; + AffineConstraints cm; // a "regular" constraint cm.add_line(1); diff --git a/tests/lac/constraint_matrix_copy_01.cc b/tests/lac/constraint_matrix_copy_01.cc index 23e91804e6..e02e52019c 100644 --- a/tests/lac/constraint_matrix_copy_01.cc +++ b/tests/lac/constraint_matrix_copy_01.cc @@ -23,7 +23,7 @@ void test() { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.add_line(1); constraints.add_entry(1, 2, 1.); @@ -39,7 +39,7 @@ test() constraints.close(); // copy the object above - ConstraintMatrix constraints_2; + AffineConstraints constraints_2; constraints_2.copy_from(constraints); // let both objects describe themselves in string form diff --git a/tests/lac/constraint_matrix_distribute_complex.cc b/tests/lac/constraint_matrix_distribute_complex.cc index 109028c328..84235109a4 100644 --- a/tests/lac/constraint_matrix_distribute_complex.cc +++ b/tests/lac/constraint_matrix_distribute_complex.cc @@ -42,7 +42,7 @@ main() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/lac/constraints.cc b/tests/lac/constraints.cc index b050b34b36..d68a6b57cc 100644 --- a/tests/lac/constraints.cc +++ b/tests/lac/constraints.cc @@ -279,7 +279,7 @@ main() DoFHandler<3> dof(tria); dof.distribute_dofs(*fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/lac/constraints_01.cc b/tests/lac/constraints_01.cc index 992851c010..06a5449b7b 100644 --- a/tests/lac/constraints_01.cc +++ b/tests/lac/constraints_01.cc @@ -20,7 +20,7 @@ #include "../tests.h" -// bug in ConstraintMatrix +// bug in AffineConstraints // index=18466 line_index=652 lines_cache[line_index]=919940456 lines.size()=21 @@ -31,7 +31,7 @@ test() std::ifstream f(SOURCE_DIR "/constraints_01/is.23"); rel.read(f); - ConstraintMatrix cm; + AffineConstraints cm; cm.clear(); cm.reinit(rel); diff --git a/tests/lac/constraints_02.cc b/tests/lac/constraints_02.cc index 659f9696cc..c9201dc598 100644 --- a/tests/lac/constraints_02.cc +++ b/tests/lac/constraints_02.cc @@ -23,7 +23,7 @@ void test() { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.add_line(1); constraints.add_entry(1, 2, 1.); diff --git a/tests/lac/constraints_block_01.cc b/tests/lac/constraints_block_01.cc index d2e91661d6..12118c218e 100644 --- a/tests/lac/constraints_block_01.cc +++ b/tests/lac/constraints_block_01.cc @@ -229,7 +229,7 @@ main() * The interface check is simplified for this 2x2 case */ - ConstraintMatrix constraints; + AffineConstraints constraints; const unsigned int dofs_per_fl_msh_face = fluid_fe->dofs_per_face; const unsigned int dofs_per_solid_face = solid_fe->dofs_per_face; diff --git a/tests/lac/constraints_c1.cc b/tests/lac/constraints_c1.cc index f0b2845206..306b665b5e 100644 --- a/tests/lac/constraints_c1.cc +++ b/tests/lac/constraints_c1.cc @@ -39,7 +39,7 @@ template void setup_constraints(const DoFHandler &dof_handler) { - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); const FiniteElement &fe = dof_handler.get_fe(); diff --git a/tests/lac/constraints_c1_02.cc b/tests/lac/constraints_c1_02.cc index ce2e300413..49d3b9c775 100644 --- a/tests/lac/constraints_c1_02.cc +++ b/tests/lac/constraints_c1_02.cc @@ -35,7 +35,7 @@ using namespace dealii; void run() { - ConstraintMatrix constraints; + AffineConstraints constraints; { constraints.add_line(7); diff --git a/tests/lac/constraints_get_lines.cc b/tests/lac/constraints_get_lines.cc index f907a4b885..8724953fd9 100644 --- a/tests/lac/constraints_get_lines.cc +++ b/tests/lac/constraints_get_lines.cc @@ -15,7 +15,7 @@ -// test: test the ConstraintMatrix::get_lines() range object +// test: test the AffineConstraints::get_lines() range object #include @@ -26,7 +26,7 @@ void test() { - ConstraintMatrix cm; + AffineConstraints cm; // an inhomogeneous constraint cm.add_line(4); diff --git a/tests/lac/constraints_hanging_nodes_bc.cc b/tests/lac/constraints_hanging_nodes_bc.cc index 01d78507a9..b1fd64aa7d 100644 --- a/tests/lac/constraints_hanging_nodes_bc.cc +++ b/tests/lac/constraints_hanging_nodes_bc.cc @@ -74,7 +74,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix correct_constraints, library_constraints; + AffineConstraints correct_constraints, library_constraints; DoFTools::make_hanging_node_constraints(dof, correct_constraints); library_constraints.merge(correct_constraints); diff --git a/tests/lac/constraints_inhomogeneous.cc b/tests/lac/constraints_inhomogeneous.cc index b82a119f21..ebdcbca8d5 100644 --- a/tests/lac/constraints_inhomogeneous.cc +++ b/tests/lac/constraints_inhomogeneous.cc @@ -28,7 +28,7 @@ void test() { - ConstraintMatrix cm; + AffineConstraints cm; // an inhomogeneous constraint cm.add_line(4); diff --git a/tests/lac/constraints_local_to_global.cc b/tests/lac/constraints_local_to_global.cc index 4bfaba9e49..d808d81a3b 100644 --- a/tests/lac/constraints_local_to_global.cc +++ b/tests/lac/constraints_local_to_global.cc @@ -16,9 +16,10 @@ // this function tests the correctness of the implementation of -// ConstraintMatrix::distribute_local_to_global for FullMatrix by comparing -// the results with a sparse matrix. As a test case, we use a square mesh that -// is refined once globally and then the first cell is refined adaptively. +// AffineConstraints::distribute_local_to_global for FullMatrix by +// comparing the results with a sparse matrix. As a test case, we use a square +// mesh that is refined once globally and then the first cell is refined +// adaptively. #include @@ -61,7 +62,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 1, diff --git a/tests/lac/constraints_local_to_global_chunk.cc b/tests/lac/constraints_local_to_global_chunk.cc index ab73862f42..e8a222d2e6 100644 --- a/tests/lac/constraints_local_to_global_chunk.cc +++ b/tests/lac/constraints_local_to_global_chunk.cc @@ -16,9 +16,9 @@ // this function tests the correctness of the implementation of -// ConstraintMatrix::distribute_local_to_global for ChunkSparseMatrix by -// comparing the results with a sparse matrix. As a test case, we use a square -// mesh that is refined once globally and then the first cell is refined +// AffineConstraints::distribute_local_to_global for ChunkSparseMatrix +// by comparing the results with a sparse matrix. As a test case, we use a +// square mesh that is refined once globally and then the first cell is refined // adaptively. #include @@ -63,7 +63,7 @@ test(unsigned int chunk_size) DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 1, diff --git a/tests/lac/constraints_local_to_global_rect.cc b/tests/lac/constraints_local_to_global_rect.cc index f667c12218..69ef9006fd 100644 --- a/tests/lac/constraints_local_to_global_rect.cc +++ b/tests/lac/constraints_local_to_global_rect.cc @@ -16,8 +16,8 @@ // this function tests the correctness of the implementation of -// ConstraintMatrix::distribute_local_to_global for row and column indices -// with different constraints on the rows and columns. +// AffineConstraints::distribute_local_to_global for row and column +// indices with different constraints on the rows and columns. #include @@ -37,8 +37,8 @@ test() local(0, 1) = 2.; local(1, 0) = -2.; local(1, 1) = 12.; - FullMatrix global1(4, 6), global2(4, 6); - ConstraintMatrix cm1, cm2; + FullMatrix global1(4, 6), global2(4, 6); + AffineConstraints cm1, cm2; cm1.add_line(2); cm1.add_entry(2, 1, 0.5); cm1.add_entry(2, 3, 0.5); diff --git a/tests/lac/constraints_merge.cc b/tests/lac/constraints_merge.cc index bc8644b507..567fc5cece 100644 --- a/tests/lac/constraints_merge.cc +++ b/tests/lac/constraints_merge.cc @@ -29,7 +29,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -40,7 +40,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); diff --git a/tests/lac/constraints_merge_02.cc b/tests/lac/constraints_merge_02.cc index 4c5c00c73c..85cbd74923 100644 --- a/tests/lac/constraints_merge_02.cc +++ b/tests/lac/constraints_merge_02.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -41,7 +41,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); diff --git a/tests/lac/constraints_merge_03.cc b/tests/lac/constraints_merge_03.cc index 778c19e9f5..3920285a1f 100644 --- a/tests/lac/constraints_merge_03.cc +++ b/tests/lac/constraints_merge_03.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -41,7 +41,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); @@ -65,7 +65,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::no_conflicts_allowed); + c1.merge(c2, AffineConstraints::no_conflicts_allowed); } catch (...) { diff --git a/tests/lac/constraints_merge_04.cc b/tests/lac/constraints_merge_04.cc index 31eecb9d70..24e2df052d 100644 --- a/tests/lac/constraints_merge_04.cc +++ b/tests/lac/constraints_merge_04.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -41,7 +41,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); @@ -65,7 +65,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::left_object_wins); + c1.merge(c2, AffineConstraints::left_object_wins); } catch (...) { diff --git a/tests/lac/constraints_merge_05.cc b/tests/lac/constraints_merge_05.cc index 5c0bdb859e..ea4a72cf8d 100644 --- a/tests/lac/constraints_merge_05.cc +++ b/tests/lac/constraints_merge_05.cc @@ -30,7 +30,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -41,7 +41,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); @@ -65,7 +65,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::right_object_wins); + c1.merge(c2, AffineConstraints::right_object_wins); } catch (...) { diff --git a/tests/lac/constraints_merge_06.cc b/tests/lac/constraints_merge_06.cc index e8c0976228..b9b503721a 100644 --- a/tests/lac/constraints_merge_06.cc +++ b/tests/lac/constraints_merge_06.cc @@ -32,7 +32,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -43,7 +43,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); @@ -71,7 +71,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::right_object_wins); + c1.merge(c2, AffineConstraints::right_object_wins); } catch (...) { diff --git a/tests/lac/constraints_merge_07.cc b/tests/lac/constraints_merge_07.cc index 3895dc4267..d8eff94700 100644 --- a/tests/lac/constraints_merge_07.cc +++ b/tests/lac/constraints_merge_07.cc @@ -33,7 +33,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge" << std::endl; + deallog << "Checking AffineConstraints::merge" << std::endl; // check twice, once with closed // objects, once with open ones @@ -44,7 +44,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; // enter simple line c1.add_line(0); @@ -76,7 +76,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::right_object_wins); + c1.merge(c2, AffineConstraints::right_object_wins); } catch (...) { diff --git a/tests/lac/constraints_merge_08.cc b/tests/lac/constraints_merge_08.cc index 42b9c64b29..4d5fbacc19 100644 --- a/tests/lac/constraints_merge_08.cc +++ b/tests/lac/constraints_merge_08.cc @@ -31,7 +31,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge with localized lines" + deallog << "Checking AffineConstraints::merge with localized lines" << std::endl; // set local lines to a very large range that @@ -65,7 +65,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines), c2(local_lines); // enter simple line c1.add_line(index_0); diff --git a/tests/lac/constraints_merge_09.cc b/tests/lac/constraints_merge_09.cc index e5007cf762..61357fc518 100644 --- a/tests/lac/constraints_merge_09.cc +++ b/tests/lac/constraints_merge_09.cc @@ -33,7 +33,7 @@ std::ofstream logfile("output"); void merge_check() { - deallog << "Checking ConstraintMatrix::merge with localized lines" + deallog << "Checking AffineConstraints::merge with localized lines" << std::endl; // set local lines to a very large range that @@ -63,7 +63,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines), c2(local_lines); // enter simple line c1.add_line(index_0); @@ -91,7 +91,7 @@ merge_check() // results try { - c1.merge(c2, ConstraintMatrix::right_object_wins); + c1.merge(c2, AffineConstraints::right_object_wins); } catch (...) { diff --git a/tests/lac/constraints_merge_10.cc b/tests/lac/constraints_merge_10.cc index 2ee0b7cf03..8088e58bea 100644 --- a/tests/lac/constraints_merge_10.cc +++ b/tests/lac/constraints_merge_10.cc @@ -27,7 +27,7 @@ void merge_check() { - deallog << "Checking ConstraintMatrix::merge with localized lines" + deallog << "Checking AffineConstraints::merge with localized lines" << std::endl; // set local lines to a very large range that @@ -66,7 +66,7 @@ merge_check() // check that the `merge' function // works correctly - ConstraintMatrix c1(local_lines1), c2(local_lines2); + AffineConstraints c1(local_lines1), c2(local_lines2); // enter simple line c1.add_line(index_0); @@ -103,7 +103,7 @@ merge_check() // now merge the two and print the // results - c1.merge(c2, ConstraintMatrix::no_conflicts_allowed, true); + c1.merge(c2, AffineConstraints::no_conflicts_allowed, true); c1.print(deallog.get_file_stream()); }; } diff --git a/tests/lac/constraints_merge_11.cc b/tests/lac/constraints_merge_11.cc index e1e1f5d441..ca4a4d92f0 100644 --- a/tests/lac/constraints_merge_11.cc +++ b/tests/lac/constraints_merge_11.cc @@ -15,8 +15,8 @@ -// Try to merge two empty ConstraintMatrix objects initialized with IndexSets -// that don't match. +// Try to merge two empty AffineConstraints objects initialized with +// IndexSets that don't match. #include @@ -27,7 +27,7 @@ void merge_check() { - deallog << "Checking ConstraintMatrix::merge with localized lines" + deallog << "Checking AffineConstraints::merge with localized lines" << std::endl; // set local lines to a very large range that @@ -46,11 +46,11 @@ merge_check() local_lines2.print(deallog.get_file_stream()); // works correctly - ConstraintMatrix c1(local_lines1), c2(local_lines2); + AffineConstraints c1(local_lines1), c2(local_lines2); // now merge the two and print the // results - c1.merge(c2, ConstraintMatrix::no_conflicts_allowed, true); + c1.merge(c2, AffineConstraints::no_conflicts_allowed, true); c1.print(deallog.get_file_stream()); deallog << "OK" << std::endl; diff --git a/tests/lac/constraints_merge_12.cc b/tests/lac/constraints_merge_12.cc index a43303c82d..14b6191f2a 100644 --- a/tests/lac/constraints_merge_12.cc +++ b/tests/lac/constraints_merge_12.cc @@ -15,9 +15,9 @@ -// Merge two ConstraintMatrix objects initialized with IndexSets where entries -// have been added in a way that local_lines extends beyond the end of the -// IndexSet +// Merge two AffineConstraints objects initialized with IndexSets where +// entries have been added in a way that local_lines extends beyond the end of +// the IndexSet #include @@ -28,7 +28,7 @@ void merge_check() { - deallog << "Checking ConstraintMatrix::merge with localized lines" + deallog << "Checking AffineConstraints::merge with localized lines" << std::endl; // set local lines to a very large range that surely triggers an error if @@ -38,7 +38,7 @@ merge_check() local_lines.compress(); // works correctly - ConstraintMatrix c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines), c2(local_lines); for (types::global_dof_index i = 99999800; i < local_lines.size(); ++i) if (i % 2 == 1) c1.add_line(i); @@ -48,7 +48,7 @@ merge_check() c2.add_line(99999802); // now merge the two and print the results - c2.merge(c1, ConstraintMatrix::right_object_wins); + c2.merge(c1, AffineConstraints::right_object_wins); c2.print(deallog.get_file_stream()); deallog << "OK" << std::endl; diff --git a/tests/lac/constraints_move.cc b/tests/lac/constraints_move.cc index 952e0cc869..2755b8a55f 100644 --- a/tests/lac/constraints_move.cc +++ b/tests/lac/constraints_move.cc @@ -27,9 +27,9 @@ main() deallog.attach(logfile); - ConstraintMatrix constraints; - unsigned int IDs[] = {1, 2, 3, 5, 8, 13, 21}; - double vals[] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0}; + AffineConstraints constraints; + unsigned int IDs[] = {1, 2, 3, 5, 8, 13, 21}; + double vals[] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0}; for (unsigned int i = 0; i < sizeof(IDs) / sizeof(IDs[0]); ++i) { constraints.add_line(IDs[i]); @@ -39,7 +39,7 @@ main() constraints.print(deallog.get_file_stream()); deallog << std::endl; - ConstraintMatrix cm(std::move(constraints)); + AffineConstraints cm(std::move(constraints)); cm.print(deallog.get_file_stream()); deallog << constraints.n_constraints() << std::endl << std::endl; diff --git a/tests/lac/constraints_shift_01.cc b/tests/lac/constraints_shift_01.cc index 90a42abdd6..b105a46bd3 100644 --- a/tests/lac/constraints_shift_01.cc +++ b/tests/lac/constraints_shift_01.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -// test ConstraintMatrix::shift for a ConstraintMatrix object +// test AffineConstraints::shift for a AffineConstraints object // initialized with an IndexSet object #include @@ -40,14 +40,14 @@ test() index_set.print(deallog); deallog - << "Create ConstraintMatrix with constraints u(2)=.5*u(5), u(5)=.7*u(8)" + << "Create AffineConstraints with constraints u(2)=.5*u(5), u(5)=.7*u(8)" << std::endl; - dealii::ConstraintMatrix constraints1(index_set); + dealii::AffineConstraints constraints1(index_set); constraints1.add_line(5); constraints1.add_entry(5, 8, .7); constraints1.add_line(2); constraints1.add_entry(2, 5, .5); - dealii::ConstraintMatrix constraints2(constraints1); + dealii::AffineConstraints constraints2(constraints1); constraints1.print(deallog.get_file_stream()); constraints1.shift(size / 2); @@ -55,7 +55,7 @@ test() constraints1.print(deallog.get_file_stream()); constraints1.merge(constraints2, - ConstraintMatrix::no_conflicts_allowed, + AffineConstraints::no_conflicts_allowed, true); deallog << "Shifted and merged constraints" << std::endl; constraints1.print(deallog.get_file_stream()); diff --git a/tests/lac/constraints_zero.cc b/tests/lac/constraints_zero.cc index 6d1115f3cc..d552ea216b 100644 --- a/tests/lac/constraints_zero.cc +++ b/tests/lac/constraints_zero.cc @@ -33,7 +33,7 @@ void test() { - ConstraintMatrix cm; + AffineConstraints cm; // a "regular" constraint cm.add_line(1); diff --git a/tests/lac/constraints_zero_condense.cc b/tests/lac/constraints_zero_condense.cc index b52d3098aa..b35d9aa338 100644 --- a/tests/lac/constraints_zero_condense.cc +++ b/tests/lac/constraints_zero_condense.cc @@ -33,7 +33,7 @@ test() { // constrain each dof to zero. this // should yield a diagonal matrix - ConstraintMatrix cm; + AffineConstraints cm; for (unsigned int i = 0; i < 5; ++i) cm.add_line(i); diff --git a/tests/lac/constraints_zero_merge.cc b/tests/lac/constraints_zero_merge.cc index 1639ccb59f..1a2e87e9db 100644 --- a/tests/lac/constraints_zero_merge.cc +++ b/tests/lac/constraints_zero_merge.cc @@ -30,7 +30,7 @@ void test() { - ConstraintMatrix cm1, cm2; + AffineConstraints cm1, cm2; // a "regular" and a singular // constraint to each of the diff --git a/tests/lac/diagonal_matrix_02.cc b/tests/lac/diagonal_matrix_02.cc index a6f35fe49b..e34af9249b 100644 --- a/tests/lac/diagonal_matrix_02.cc +++ b/tests/lac/diagonal_matrix_02.cc @@ -71,7 +71,7 @@ test(const bool hanging_nodes = true) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/lac/inhomogeneous_constraints.cc b/tests/lac/inhomogeneous_constraints.cc index b0923ca7cb..dda5084948 100644 --- a/tests/lac/inhomogeneous_constraints.cc +++ b/tests/lac/inhomogeneous_constraints.cc @@ -98,8 +98,8 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix hanging_nodes_only; - ConstraintMatrix test_all_constraints; + AffineConstraints hanging_nodes_only; + AffineConstraints test_all_constraints; SparsityPattern sparsity_pattern; SparseMatrix reference_matrix; diff --git a/tests/lac/inhomogeneous_constraints_02.cc b/tests/lac/inhomogeneous_constraints_02.cc index 1f364a1dec..02cfbaca84 100644 --- a/tests/lac/inhomogeneous_constraints_02.cc +++ b/tests/lac/inhomogeneous_constraints_02.cc @@ -61,7 +61,7 @@ using namespace dealii; void test(bool use_inhomogeneity_for_rhs) { - ConstraintMatrix cm; + AffineConstraints cm; cm.add_line(2); cm.set_inhomogeneity(2, 3.0); diff --git a/tests/lac/inhomogeneous_constraints_03.cc b/tests/lac/inhomogeneous_constraints_03.cc index 96f5b03966..570ee73267 100644 --- a/tests/lac/inhomogeneous_constraints_03.cc +++ b/tests/lac/inhomogeneous_constraints_03.cc @@ -65,7 +65,7 @@ using namespace dealii; void test(bool use_inhomogeneity_for_rhs) { - ConstraintMatrix cm; + AffineConstraints cm; cm.add_line(1); cm.set_inhomogeneity(1, -5.0); diff --git a/tests/lac/inhomogeneous_constraints_04.cc b/tests/lac/inhomogeneous_constraints_04.cc index dbfbb485c1..0eb81cc7fd 100644 --- a/tests/lac/inhomogeneous_constraints_04.cc +++ b/tests/lac/inhomogeneous_constraints_04.cc @@ -92,7 +92,7 @@ test(bool use_constraint_matrix) if (use_constraint_matrix == true) { - ConstraintMatrix cm; + AffineConstraints cm; cm.add_line(1); cm.set_inhomogeneity(1, -5.0); diff --git a/tests/lac/inhomogeneous_constraints_block.cc b/tests/lac/inhomogeneous_constraints_block.cc index b412bd87b8..3849de952b 100644 --- a/tests/lac/inhomogeneous_constraints_block.cc +++ b/tests/lac/inhomogeneous_constraints_block.cc @@ -80,8 +80,8 @@ private: DoFHandler dof_handler; FESystem fe; - ConstraintMatrix hanging_nodes_only; - ConstraintMatrix test_all_constraints; + AffineConstraints hanging_nodes_only; + AffineConstraints test_all_constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix reference_matrix; diff --git a/tests/lac/inhomogeneous_constraints_nonsymmetric.cc b/tests/lac/inhomogeneous_constraints_nonsymmetric.cc index 7289ae98a8..b50218b818 100644 --- a/tests/lac/inhomogeneous_constraints_nonsymmetric.cc +++ b/tests/lac/inhomogeneous_constraints_nonsymmetric.cc @@ -79,8 +79,8 @@ private: DoFHandler dof_handler; FE_Q fe; - ConstraintMatrix hanging_nodes_only; - ConstraintMatrix test_all_constraints; + AffineConstraints hanging_nodes_only; + AffineConstraints test_all_constraints; SparsityPattern sparsity_pattern; SparseMatrix reference_matrix; diff --git a/tests/lac/inhomogeneous_constraints_vector.cc b/tests/lac/inhomogeneous_constraints_vector.cc index 95feedd667..0a49f86b3f 100644 --- a/tests/lac/inhomogeneous_constraints_vector.cc +++ b/tests/lac/inhomogeneous_constraints_vector.cc @@ -17,10 +17,11 @@ // this function tests the correctness of the implementation of // inhomogeneous constraints with -// ConstraintMatrix::distribute_local_to_global operating only on a vector, -// based on a modification of the step-5 tutorial program. It assumes -// correctness of the function ConstraintMatrix::distribute_local_to_global -// operating on both the matrix and vector simultaneously. +// AffineConstraints::distribute_local_to_global operating only on a +// vector, based on a modification of the step-5 tutorial program. It assumes +// correctness of the function +// AffineConstraints::distribute_local_to_global operating on both the +// matrix and vector simultaneously. #include #include @@ -79,9 +80,9 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; - ConstraintMatrix constraints; + Vector solution; + Vector system_rhs; + AffineConstraints constraints; }; template diff --git a/tests/lac/linear_operator_11.cc b/tests/lac/linear_operator_11.cc index 6fef76bf62..504437367b 100644 --- a/tests/lac/linear_operator_11.cc +++ b/tests/lac/linear_operator_11.cc @@ -66,7 +66,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; TrilinosWrappers::MPI::Vector solution; diff --git a/tests/lac/linear_operator_12.cc b/tests/lac/linear_operator_12.cc index ee4db525ce..9e620bb6e0 100644 --- a/tests/lac/linear_operator_12.cc +++ b/tests/lac/linear_operator_12.cc @@ -72,8 +72,8 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/lac/linear_operator_12a.cc b/tests/lac/linear_operator_12a.cc index d6a1625a80..b891934936 100644 --- a/tests/lac/linear_operator_12a.cc +++ b/tests/lac/linear_operator_12a.cc @@ -73,8 +73,8 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/lac/linear_operator_13.cc b/tests/lac/linear_operator_13.cc index ac6bbf71df..e960a38567 100644 --- a/tests/lac/linear_operator_13.cc +++ b/tests/lac/linear_operator_13.cc @@ -64,11 +64,11 @@ build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix, block_component[1] = 1; // Initialise - const FESystem fe(fe_test, 1, fe_trial, 1); - Triangulation triangulation; - QGauss quadrature_formula(fe_trial.degree + 1); - DoFHandler dof_handler(triangulation); - ConstraintMatrix constraints; + const FESystem fe(fe_test, 1, fe_trial, 1); + Triangulation triangulation; + QGauss quadrature_formula(fe_trial.degree + 1); + DoFHandler dof_handler(triangulation); + AffineConstraints constraints; const unsigned int dofs_per_cell = fe.dofs_per_cell; diff --git a/tests/lac/linear_operator_14.cc b/tests/lac/linear_operator_14.cc index cc9f654e75..e35c5ec3db 100644 --- a/tests/lac/linear_operator_14.cc +++ b/tests/lac/linear_operator_14.cc @@ -84,9 +84,9 @@ build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix, typename Triangulation::MeshSmoothing( Triangulation::smoothing_on_refinement | Triangulation::smoothing_on_coarsening)); - QGauss quadrature_formula(fe_trial.degree + 1); - DoFHandler dof_handler(triangulation); - ConstraintMatrix constraints; + QGauss quadrature_formula(fe_trial.degree + 1); + DoFHandler dof_handler(triangulation); + AffineConstraints constraints; const unsigned int dofs_per_cell = fe.dofs_per_cell; diff --git a/tests/lac/matrices_02.cc b/tests/lac/matrices_02.cc index df948e7b2e..8fc7899678 100644 --- a/tests/lac/matrices_02.cc +++ b/tests/lac/matrices_02.cc @@ -160,7 +160,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/lac/schur_complement_03.cc b/tests/lac/schur_complement_03.cc index 063faffe54..7056e4dc7b 100644 --- a/tests/lac/schur_complement_03.cc +++ b/tests/lac/schur_complement_03.cc @@ -81,7 +81,7 @@ namespace Step22 Triangulation triangulation; FESystem fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; BlockVector solution; diff --git a/tests/lac/utilities_02.cc b/tests/lac/utilities_02.cc index 1eac700ce4..829df9a24b 100644 --- a/tests/lac/utilities_02.cc +++ b/tests/lac/utilities_02.cc @@ -98,7 +98,7 @@ test() IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, diff --git a/tests/mappings/mapping_q_convergence.cc b/tests/mappings/mapping_q_convergence.cc index f208d61c87..980fa6811f 100644 --- a/tests/mappings/mapping_q_convergence.cc +++ b/tests/mappings/mapping_q_convergence.cc @@ -199,7 +199,7 @@ test(const FiniteElement &fe) { Geometry geometry; TranscendentalManufacturedSolution fe_function; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "FE degree: " << fe.degree << std::endl; diff --git a/tests/mappings/mapping_q_eulerian_08.cc b/tests/mappings/mapping_q_eulerian_08.cc index e5ea9887a8..532fea53f2 100644 --- a/tests/mappings/mapping_q_eulerian_08.cc +++ b/tests/mappings/mapping_q_eulerian_08.cc @@ -173,12 +173,12 @@ test(const unsigned int n_ref = 0) DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); // constraints: - ConstraintMatrix constraints_euler; + AffineConstraints constraints_euler; constraints_euler.reinit(locally_relevant_dofs_euler); DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler); constraints_euler.close(); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints_euler.close(); @@ -285,8 +285,8 @@ test(const unsigned int n_ref = 0) update_values | update_gradients | update_JxW_values | update_quadrature_points; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof_handler, level, relevant_dofs); diff --git a/tests/mappings/mapping_q_eulerian_09.cc b/tests/mappings/mapping_q_eulerian_09.cc index 193c27afb5..3ad4a3f2e7 100644 --- a/tests/mappings/mapping_q_eulerian_09.cc +++ b/tests/mappings/mapping_q_eulerian_09.cc @@ -111,12 +111,12 @@ test() DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); // constraints: - ConstraintMatrix constraints_euler; + AffineConstraints constraints_euler; constraints_euler.reinit(locally_relevant_dofs_euler); DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler); constraints_euler.close(); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints_euler.close(); diff --git a/tests/mappings/mapping_q_manifold_01.cc b/tests/mappings/mapping_q_manifold_01.cc index 216869b51f..df4dabb171 100644 --- a/tests/mappings/mapping_q_manifold_01.cc +++ b/tests/mappings/mapping_q_manifold_01.cc @@ -195,7 +195,7 @@ test(const FiniteElement &fe) { MappingQ mapping(mapping_p, true); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/matrix_free/cell_categorization.cc b/tests/matrix_free/cell_categorization.cc index 1bbca99833..45d37eaeb3 100644 --- a/tests/matrix_free/cell_categorization.cc +++ b/tests/matrix_free/cell_categorization.cc @@ -68,7 +68,7 @@ test() FE_DGQ fe(1); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); MatrixFree mf_data; diff --git a/tests/matrix_free/compare_faces_by_cells.cc b/tests/matrix_free/compare_faces_by_cells.cc index 790f253414..a24cf3dc94 100644 --- a/tests/matrix_free/compare_faces_by_cells.cc +++ b/tests/matrix_free/compare_faces_by_cells.cc @@ -71,7 +71,7 @@ public: update_JxW_values | update_normal_vectors | update_jacobians; addit_data.mapping_update_flags_faces_by_cells = update_JxW_values | update_normal_vectors | update_jacobians; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); data.reinit(mapping, dof_handler, constraints, quad, addit_data); diff --git a/tests/matrix_free/compress_constraints.cc b/tests/matrix_free/compress_constraints.cc index ad10315bc5..8778984713 100644 --- a/tests/matrix_free/compress_constraints.cc +++ b/tests/matrix_free/compress_constraints.cc @@ -74,7 +74,7 @@ test() FE_Q fe(2); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/compress_mapping.cc b/tests/matrix_free/compress_mapping.cc index fad6fe8809..81dae4a9a1 100644 --- a/tests/matrix_free/compress_mapping.cc +++ b/tests/matrix_free/compress_mapping.cc @@ -72,7 +72,7 @@ test() FE_Q fe(1); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); @@ -109,7 +109,7 @@ test_cube() FE_Q fe(1); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); @@ -153,7 +153,7 @@ test_parallelogram() FE_Q fe(1); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/copy.cc b/tests/matrix_free/copy.cc index 2faa7bd80b..4b33d8c334 100644 --- a/tests/matrix_free/copy.cc +++ b/tests/matrix_free/copy.cc @@ -67,7 +67,7 @@ sub_test() tria.execute_coarsening_and_refinement(); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/copy_feevaluation.cc b/tests/matrix_free/copy_feevaluation.cc index de4c700092..3ba33e1fdf 100644 --- a/tests/matrix_free/copy_feevaluation.cc +++ b/tests/matrix_free/copy_feevaluation.cc @@ -158,7 +158,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints, constraints_u, constraints_p; + AffineConstraints constraints, constraints_u, constraints_p; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -306,7 +306,7 @@ test() std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&constraints_u); constraints.push_back(&constraints_p); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/dg_pbc_01.cc b/tests/matrix_free/dg_pbc_01.cc index 1dbe4cccf2..699d1798ae 100644 --- a/tests/matrix_free/dg_pbc_01.cc +++ b/tests/matrix_free/dg_pbc_01.cc @@ -68,7 +68,7 @@ test() FE_DGQ fe(0); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); MappingQ mapping(fe_degree + 1); diff --git a/tests/matrix_free/dg_pbc_02.cc b/tests/matrix_free/dg_pbc_02.cc index 94eed1a597..d95b361a43 100644 --- a/tests/matrix_free/dg_pbc_02.cc +++ b/tests/matrix_free/dg_pbc_02.cc @@ -83,7 +83,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); dof.distribute_mg_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); const QGauss<1> quad(1); diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc index ef5bc79029..bd0c8b503c 100644 --- a/tests/matrix_free/estimate_condition_number_mass.cc +++ b/tests/matrix_free/estimate_condition_number_mass.cc @@ -112,7 +112,7 @@ test(const FiniteElement &fe, const unsigned int n_iterations) DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name() << std::endl; diff --git a/tests/matrix_free/faces_value_optimization.cc b/tests/matrix_free/faces_value_optimization.cc index c4b838966e..40cbab8677 100644 --- a/tests/matrix_free/faces_value_optimization.cc +++ b/tests/matrix_free/faces_value_optimization.cc @@ -210,7 +210,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); typedef double number; diff --git a/tests/matrix_free/faces_value_optimization_02.cc b/tests/matrix_free/faces_value_optimization_02.cc index e3a7beea38..2f8a6a3a03 100644 --- a/tests/matrix_free/faces_value_optimization_02.cc +++ b/tests/matrix_free/faces_value_optimization_02.cc @@ -210,7 +210,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); typedef double number; diff --git a/tests/matrix_free/fe_evaluation_dofs_per_cell.cc b/tests/matrix_free/fe_evaluation_dofs_per_cell.cc index d31db4bf67..84ed749912 100644 --- a/tests/matrix_free/fe_evaluation_dofs_per_cell.cc +++ b/tests/matrix_free/fe_evaluation_dofs_per_cell.cc @@ -79,7 +79,7 @@ test() dof.distribute_dofs(*fes[i]); MatrixFree matrix_free; matrix_free.reinit(dof, - ConstraintMatrix(), + AffineConstraints(), QGauss<1>(degree + 3), typename MatrixFree::AdditionalData()); if (i < 2) diff --git a/tests/matrix_free/get_functions_cartesian.cc b/tests/matrix_free/get_functions_cartesian.cc index 1050c05b6c..247d03312f 100644 --- a/tests/matrix_free/get_functions_cartesian.cc +++ b/tests/matrix_free/get_functions_cartesian.cc @@ -41,7 +41,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc index 50bec5a777..c689788c3d 100644 --- a/tests/matrix_free/get_functions_circle.cc +++ b/tests/matrix_free/get_functions_circle.cc @@ -53,7 +53,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_common.h b/tests/matrix_free/get_functions_common.h index 8af1a7f749..0947b1dedd 100644 --- a/tests/matrix_free/get_functions_common.h +++ b/tests/matrix_free/get_functions_common.h @@ -233,7 +233,8 @@ public: template void -do_test(const DoFHandler &dof, const ConstraintMatrix &constraints) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; // use this for info on problem diff --git a/tests/matrix_free/get_functions_constraints.cc b/tests/matrix_free/get_functions_constraints.cc index 722c625913..b8f27f335b 100644 --- a/tests/matrix_free/get_functions_constraints.cc +++ b/tests/matrix_free/get_functions_constraints.cc @@ -44,7 +44,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_faces.cc b/tests/matrix_free/get_functions_faces.cc index a7993ad610..be4f4d4203 100644 --- a/tests/matrix_free/get_functions_faces.cc +++ b/tests/matrix_free/get_functions_faces.cc @@ -132,7 +132,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); MatrixFree mf_data; diff --git a/tests/matrix_free/get_functions_float.cc b/tests/matrix_free/get_functions_float.cc index c34b21fe87..d4235a9125 100644 --- a/tests/matrix_free/get_functions_float.cc +++ b/tests/matrix_free/get_functions_float.cc @@ -55,7 +55,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 1, diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc index 4aa88bc9be..76269635ad 100644 --- a/tests/matrix_free/get_functions_gl.cc +++ b/tests/matrix_free/get_functions_gl.cc @@ -56,7 +56,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc index 9b4dc841d5..c45627abf3 100644 --- a/tests/matrix_free/get_functions_mappingq.cc +++ b/tests/matrix_free/get_functions_mappingq.cc @@ -54,7 +54,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_multife.cc b/tests/matrix_free/get_functions_multife.cc index 00949ae055..9f51a9abd5 100644 --- a/tests/matrix_free/get_functions_multife.cc +++ b/tests/matrix_free/get_functions_multife.cc @@ -240,12 +240,12 @@ test() for (unsigned int no = 0; no < dof.size(); ++no) src[no].reinit(dof[no]->n_dofs()); - std::vector constraints(2); - ConstraintMatrix constraint0; + std::vector *> constraints(2); + AffineConstraints constraint0; DoFTools::make_hanging_node_constraints(*dof[0], constraint0); constraint0.close(); constraints[0] = &constraint0; - ConstraintMatrix constraint1; + AffineConstraints constraint1; DoFTools::make_hanging_node_constraints(*dof[1], constraint1); constraint1.close(); constraints[1] = &constraint1; diff --git a/tests/matrix_free/get_functions_multife2.cc b/tests/matrix_free/get_functions_multife2.cc index 94639d5037..08336cf52a 100644 --- a/tests/matrix_free/get_functions_multife2.cc +++ b/tests/matrix_free/get_functions_multife2.cc @@ -284,16 +284,16 @@ test() for (unsigned int i = 0; i < dof.size(); ++i) src[i].reinit(dof[i]->n_dofs()); - std::vector constraints(3); - ConstraintMatrix constraint0; + std::vector *> constraints(3); + AffineConstraints constraint0; DoFTools::make_hanging_node_constraints(*dof[0], constraint0); constraint0.close(); constraints[0] = &constraint0; - ConstraintMatrix constraint1; + AffineConstraints constraint1; DoFTools::make_hanging_node_constraints(*dof[1], constraint1); constraint1.close(); constraints[1] = &constraint1; - ConstraintMatrix constraint2; + AffineConstraints constraint2; DoFTools::make_hanging_node_constraints(*dof[2], constraint2); constraint2.close(); constraints[2] = &constraint2; diff --git a/tests/matrix_free/get_functions_notempl.cc b/tests/matrix_free/get_functions_notempl.cc index c7beab690b..7a643e4e46 100644 --- a/tests/matrix_free/get_functions_notempl.cc +++ b/tests/matrix_free/get_functions_notempl.cc @@ -31,10 +31,10 @@ std::ofstream logfile("output"); template void -sub_test(const DoFHandler & dof, - const ConstraintMatrix & constraints, - MatrixFree &mf_data, - Vector & solution) +sub_test(const DoFHandler & dof, + const AffineConstraints &constraints, + MatrixFree & mf_data, + Vector & solution) { deallog << "Test with fe_degree " << fe_degree << ", n_q_points_1d: " << (n_q_points_1d) << std::endl; @@ -76,7 +76,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc index 3745f1cfd4..10970a472e 100644 --- a/tests/matrix_free/get_functions_q_hierarchical.cc +++ b/tests/matrix_free/get_functions_q_hierarchical.cc @@ -62,7 +62,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc index 051d2a734c..5c987c2da4 100644 --- a/tests/matrix_free/get_functions_rect.cc +++ b/tests/matrix_free/get_functions_rect.cc @@ -31,10 +31,10 @@ std::ofstream logfile("output"); template void -sub_test(const DoFHandler & dof, - const ConstraintMatrix & constraints, - MatrixFree &mf_data, - Vector & solution) +sub_test(const DoFHandler & dof, + const AffineConstraints &constraints, + MatrixFree & mf_data, + Vector & solution) { deallog << "Test with fe_degree " << fe_degree << ", n_q_points_1d: " << (n_q_points_1d) << std::endl; @@ -76,7 +76,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/get_functions_variants.cc b/tests/matrix_free/get_functions_variants.cc index c65309261f..060c8be341 100644 --- a/tests/matrix_free/get_functions_variants.cc +++ b/tests/matrix_free/get_functions_variants.cc @@ -178,8 +178,8 @@ test() solution_dist(i) = entry; } - ConstraintMatrix constraints; - MatrixFree mf_data; + AffineConstraints constraints; + MatrixFree mf_data; { const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/get_functions_variants_gl.cc b/tests/matrix_free/get_functions_variants_gl.cc index 6ed298554f..642653b58d 100644 --- a/tests/matrix_free/get_functions_variants_gl.cc +++ b/tests/matrix_free/get_functions_variants_gl.cc @@ -174,8 +174,8 @@ test() solution_dist(i) = entry; } - ConstraintMatrix constraints; - MatrixFree mf_data; + AffineConstraints constraints; + MatrixFree mf_data; { const QGaussLobatto<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index 3d05d97ef9..4820501b64 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -115,7 +115,8 @@ protected: template void -do_test(const DoFHandler &dof, const ConstraintMatrix &constraints) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; // std::cout << "Number of cells: " << @@ -177,7 +178,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 1, diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index ae50b908f4..88609f0ef3 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -197,7 +197,7 @@ test() // std::cout << "Number of cells: " << tria.n_active_cells() << std::endl; // std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index e0a0c8f26e..4151c1f63a 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -301,12 +301,12 @@ test() dst[4].reinit(dst[0]); dst[5].reinit(dst[0]); - std::vector constraints(2); - ConstraintMatrix constraint0; + std::vector *> constraints(2); + AffineConstraints constraint0; DoFTools::make_hanging_node_constraints(*dof[0], constraint0); constraint0.close(); constraints[0] = &constraint0; - ConstraintMatrix constraint1; + AffineConstraints constraint1; DoFTools::make_hanging_node_constraints(*dof[1], constraint1); constraint1.close(); constraints[1] = &constraint1; diff --git a/tests/matrix_free/integrate_functions_multife2.cc b/tests/matrix_free/integrate_functions_multife2.cc index 92dfa70c93..30084f6928 100644 --- a/tests/matrix_free/integrate_functions_multife2.cc +++ b/tests/matrix_free/integrate_functions_multife2.cc @@ -291,11 +291,11 @@ test() dst[4].reinit(dst[0]); dst[5].reinit(dst[0]); - std::vector constraints(2); - ConstraintMatrix constraint0; + std::vector *> constraints(2); + AffineConstraints constraint0; constraint0.close(); constraints[0] = &constraint0; - ConstraintMatrix constraint1; + AffineConstraints constraint1; DoFTools::make_hanging_node_constraints(*dof[1], constraint1); constraint1.close(); constraints[1] = &constraint1; diff --git a/tests/matrix_free/interpolate_constant.cc b/tests/matrix_free/interpolate_constant.cc index 364d2a3c1a..49edb17e78 100644 --- a/tests/matrix_free/interpolate_constant.cc +++ b/tests/matrix_free/interpolate_constant.cc @@ -64,7 +64,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -73,7 +73,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -83,7 +83,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } diff --git a/tests/matrix_free/interpolate_cubic.cc b/tests/matrix_free/interpolate_cubic.cc index f7a32d28ec..4e6c71ab61 100644 --- a/tests/matrix_free/interpolate_cubic.cc +++ b/tests/matrix_free/interpolate_cubic.cc @@ -102,7 +102,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -111,7 +111,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -121,7 +121,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } diff --git a/tests/matrix_free/interpolate_functions_common.h b/tests/matrix_free/interpolate_functions_common.h index 94d159bb26..914fbf4218 100644 --- a/tests/matrix_free/interpolate_functions_common.h +++ b/tests/matrix_free/interpolate_functions_common.h @@ -309,7 +309,8 @@ protected: template void -do_test(const DoFHandler &dof, const ConstraintMatrix &constraints) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; // use this for info on problem diff --git a/tests/matrix_free/interpolate_linear.cc b/tests/matrix_free/interpolate_linear.cc index b3f2c19b19..35825c446d 100644 --- a/tests/matrix_free/interpolate_linear.cc +++ b/tests/matrix_free/interpolate_linear.cc @@ -73,7 +73,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -82,7 +82,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -92,7 +92,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } diff --git a/tests/matrix_free/interpolate_quadratic.cc b/tests/matrix_free/interpolate_quadratic.cc index 2adcf27e59..a19b0b0fd6 100644 --- a/tests/matrix_free/interpolate_quadratic.cc +++ b/tests/matrix_free/interpolate_quadratic.cc @@ -85,7 +85,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -94,7 +94,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } @@ -104,7 +104,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); } diff --git a/tests/matrix_free/interpolate_to_mg.cc b/tests/matrix_free/interpolate_to_mg.cc index f4a29de4dd..da435b733c 100644 --- a/tests/matrix_free/interpolate_to_mg.cc +++ b/tests/matrix_free/interpolate_to_mg.cc @@ -136,7 +136,7 @@ test(const unsigned int n_glob_ref = 2, const unsigned int n_ref = 0) DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); // constraints: - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/matrix_free/inverse_mass_01.cc b/tests/matrix_free/inverse_mass_01.cc index 74b38e258d..e1e87c6ccc 100644 --- a/tests/matrix_free/inverse_mass_01.cc +++ b/tests/matrix_free/inverse_mass_01.cc @@ -144,7 +144,7 @@ do_test(const DoFHandler &dof) data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; data.tasks_block_size = 3; - ConstraintMatrix constraints; + AffineConstraints constraints; mf_data.reinit(mapping, dof, constraints, quad, data); } diff --git a/tests/matrix_free/inverse_mass_02.cc b/tests/matrix_free/inverse_mass_02.cc index 14d12aba05..d105f4f30c 100644 --- a/tests/matrix_free/inverse_mass_02.cc +++ b/tests/matrix_free/inverse_mass_02.cc @@ -143,7 +143,7 @@ do_test(const DoFHandler &dof) data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; data.tasks_block_size = 3; - ConstraintMatrix constraints; + AffineConstraints constraints; mf_data.reinit(dof, constraints, quad, data); } diff --git a/tests/matrix_free/inverse_mass_03.cc b/tests/matrix_free/inverse_mass_03.cc index 9881fb80df..f2d3571119 100644 --- a/tests/matrix_free/inverse_mass_03.cc +++ b/tests/matrix_free/inverse_mass_03.cc @@ -159,7 +159,7 @@ do_test(const DoFHandler &dof) data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; data.tasks_block_size = 3; - ConstraintMatrix constraints; + AffineConstraints constraints; mf_data.reinit(mapping, dof, constraints, quad, data); } diff --git a/tests/matrix_free/jxw_values.cc b/tests/matrix_free/jxw_values.cc index 5f516f5cee..7ea5a0d5e8 100644 --- a/tests/matrix_free/jxw_values.cc +++ b/tests/matrix_free/jxw_values.cc @@ -61,7 +61,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index f5ec4a9e3a..3d65339ec4 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -91,7 +91,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/laplace_operator_02.cc b/tests/matrix_free/laplace_operator_02.cc index 04a267aed3..5b1770cd5a 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -132,7 +132,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/mass_operator_01.cc b/tests/matrix_free/mass_operator_01.cc index 795d7ad37a..31676da9c8 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -99,7 +99,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/mass_operator_02.cc b/tests/matrix_free/mass_operator_02.cc index c736752c45..2fff37b858 100644 --- a/tests/matrix_free/mass_operator_02.cc +++ b/tests/matrix_free/mass_operator_02.cc @@ -64,7 +64,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/mass_operator_03.cc b/tests/matrix_free/mass_operator_03.cc index 311f87ce2e..0bc6d1ea1e 100644 --- a/tests/matrix_free/mass_operator_03.cc +++ b/tests/matrix_free/mass_operator_03.cc @@ -65,7 +65,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/mass_operator_04.cc b/tests/matrix_free/mass_operator_04.cc index 409bd59ba8..7fc3d09f69 100644 --- a/tests/matrix_free/mass_operator_04.cc +++ b/tests/matrix_free/mass_operator_04.cc @@ -59,7 +59,8 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints_0(relevant_set), constraints_1(relevant_set); + AffineConstraints constraints_0(relevant_set), + constraints_1(relevant_set); VectorTools::interpolate_boundary_values(dof, 0, Functions::ZeroFunction(), @@ -79,8 +80,8 @@ test() mf_data_0->reinit(dof, constraints_0, quad, data); mf_data_1->reinit(dof, constraints_1, quad, data); { - std::vector *> dof_handlers(2, &dof); - std::vector constraint(2); + std::vector *> dof_handlers(2, &dof); + std::vector *> constraint(2); constraint[0] = &constraints_0; constraint[1] = &constraints_1; mf_data_combined->reinit(dof_handlers, constraint, quad, data); diff --git a/tests/matrix_free/matrix_vector_01.cc b/tests/matrix_free/matrix_vector_01.cc index 2b2848ac20..5afe04dd70 100644 --- a/tests/matrix_free/matrix_vector_01.cc +++ b/tests/matrix_free/matrix_vector_01.cc @@ -38,7 +38,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints); diff --git a/tests/matrix_free/matrix_vector_02.cc b/tests/matrix_free/matrix_vector_02.cc index 6a2377c3fa..b8f8a1d39c 100644 --- a/tests/matrix_free/matrix_vector_02.cc +++ b/tests/matrix_free/matrix_vector_02.cc @@ -40,7 +40,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; VectorTools::interpolate_boundary_values(dof, 0, Functions::ZeroFunction(), diff --git a/tests/matrix_free/matrix_vector_03.cc b/tests/matrix_free/matrix_vector_03.cc index 241a534728..6886d05aad 100644 --- a/tests/matrix_free/matrix_vector_03.cc +++ b/tests/matrix_free/matrix_vector_03.cc @@ -66,7 +66,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_04.cc b/tests/matrix_free/matrix_vector_04.cc index cdc1d0eb37..0a64a3174c 100644 --- a/tests/matrix_free/matrix_vector_04.cc +++ b/tests/matrix_free/matrix_vector_04.cc @@ -42,7 +42,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/matrix_vector_04b.cc b/tests/matrix_free/matrix_vector_04b.cc index eb477f1540..57e3e83842 100644 --- a/tests/matrix_free/matrix_vector_04b.cc +++ b/tests/matrix_free/matrix_vector_04b.cc @@ -40,7 +40,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/matrix_vector_05.cc b/tests/matrix_free/matrix_vector_05.cc index d68bde1e01..d46f5c155d 100644 --- a/tests/matrix_free/matrix_vector_05.cc +++ b/tests/matrix_free/matrix_vector_05.cc @@ -72,7 +72,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/matrix_vector_06.cc b/tests/matrix_free/matrix_vector_06.cc index 4cf774e549..ac3c8744f5 100644 --- a/tests/matrix_free/matrix_vector_06.cc +++ b/tests/matrix_free/matrix_vector_06.cc @@ -66,7 +66,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_06_notempl.cc b/tests/matrix_free/matrix_vector_06_notempl.cc index 3eefec09ec..c1a846dcca 100644 --- a/tests/matrix_free/matrix_vector_06_notempl.cc +++ b/tests/matrix_free/matrix_vector_06_notempl.cc @@ -62,7 +62,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_07.cc b/tests/matrix_free/matrix_vector_07.cc index 13c628353d..4a63bc1577 100644 --- a/tests/matrix_free/matrix_vector_07.cc +++ b/tests/matrix_free/matrix_vector_07.cc @@ -80,7 +80,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; // there should not be any hanging nodes or // boundary conditions for FE_DGQ as there are // only interior DoFs on the elements, but try diff --git a/tests/matrix_free/matrix_vector_08.cc b/tests/matrix_free/matrix_vector_08.cc index 1263b68ba1..f5479f387a 100644 --- a/tests/matrix_free/matrix_vector_08.cc +++ b/tests/matrix_free/matrix_vector_08.cc @@ -65,7 +65,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_09.cc b/tests/matrix_free/matrix_vector_09.cc index 49597338cc..79deecbad7 100644 --- a/tests/matrix_free/matrix_vector_09.cc +++ b/tests/matrix_free/matrix_vector_09.cc @@ -64,7 +64,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index 054793d8b6..ed61292cf8 100644 --- a/tests/matrix_free/matrix_vector_10.cc +++ b/tests/matrix_free/matrix_vector_10.cc @@ -97,7 +97,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_11.cc b/tests/matrix_free/matrix_vector_11.cc index fb9167c29b..99a8c6e509 100644 --- a/tests/matrix_free/matrix_vector_11.cc +++ b/tests/matrix_free/matrix_vector_11.cc @@ -90,7 +90,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index 9c4325be23..9372a9be23 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -157,7 +157,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index ff002a8c78..c391df4808 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -155,7 +155,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_14.cc b/tests/matrix_free/matrix_vector_14.cc index 98d6ebf076..43ea839fb2 100644 --- a/tests/matrix_free/matrix_vector_14.cc +++ b/tests/matrix_free/matrix_vector_14.cc @@ -60,7 +60,7 @@ test() FE_DGP fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; do_test(dof, constraints); } diff --git a/tests/matrix_free/matrix_vector_14_notempl.cc b/tests/matrix_free/matrix_vector_14_notempl.cc index 8b55075dd5..2d32356c3f 100644 --- a/tests/matrix_free/matrix_vector_14_notempl.cc +++ b/tests/matrix_free/matrix_vector_14_notempl.cc @@ -57,7 +57,7 @@ test() FE_DGP fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; do_test(dof, constraints); } diff --git a/tests/matrix_free/matrix_vector_14b.cc b/tests/matrix_free/matrix_vector_14b.cc index aa07916c94..282003a9cc 100644 --- a/tests/matrix_free/matrix_vector_14b.cc +++ b/tests/matrix_free/matrix_vector_14b.cc @@ -56,7 +56,7 @@ test() FE_DGP fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; do_test(dof, constraints); } diff --git a/tests/matrix_free/matrix_vector_15.cc b/tests/matrix_free/matrix_vector_15.cc index 8c72daf29c..698da9c78a 100644 --- a/tests/matrix_free/matrix_vector_15.cc +++ b/tests/matrix_free/matrix_vector_15.cc @@ -54,8 +54,8 @@ template & dof_handler, - const ConstraintMatrix &constraints) + MatrixFreeTest(const DoFHandler & dof_handler, + const AffineConstraints &constraints) : dof_handler(dof_handler) , constraints(constraints) {} @@ -90,17 +90,17 @@ public: }; private: - const DoFHandler & dof_handler; - const ConstraintMatrix &constraints; + const DoFHandler & dof_handler; + const AffineConstraints &constraints; }; template void -do_test(const DoFHandler & dof, - const ConstraintMatrix &constraints, - const unsigned int parallel_option = 0) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints, + const unsigned int parallel_option = 0) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; if (parallel_option > 0) @@ -212,7 +212,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_16.cc b/tests/matrix_free/matrix_vector_16.cc index f31c624515..339e0bce73 100644 --- a/tests/matrix_free/matrix_vector_16.cc +++ b/tests/matrix_free/matrix_vector_16.cc @@ -54,8 +54,8 @@ template & dof_handler, - const ConstraintMatrix &constraints) + MatrixFreeTest(const DoFHandler & dof_handler, + const AffineConstraints &constraints) : dof_handler(dof_handler) , constraints(constraints) {} @@ -92,17 +92,17 @@ public: }; private: - const DoFHandler & dof_handler; - const ConstraintMatrix &constraints; + const DoFHandler & dof_handler; + const AffineConstraints &constraints; }; template void -do_test(const DoFHandler & dof, - const ConstraintMatrix &constraints, - const unsigned int parallel_option = 0) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints, + const unsigned int parallel_option = 0) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; if (parallel_option > 0) @@ -219,7 +219,7 @@ test() FESystem fe(FE_Q(degree), dim); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_17.cc b/tests/matrix_free/matrix_vector_17.cc index 265480b70d..3c0fbe48cb 100644 --- a/tests/matrix_free/matrix_vector_17.cc +++ b/tests/matrix_free/matrix_vector_17.cc @@ -59,7 +59,7 @@ test() FE_Q_DG0 fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_18.cc b/tests/matrix_free/matrix_vector_18.cc index 925d8db767..edea1e308c 100644 --- a/tests/matrix_free/matrix_vector_18.cc +++ b/tests/matrix_free/matrix_vector_18.cc @@ -106,9 +106,9 @@ private: template void -do_test(const DoFHandler & dof, - const ConstraintMatrix &constraints, - const unsigned int parallel_option = 0) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints, + const unsigned int parallel_option = 0) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; if (parallel_option > 0) @@ -237,7 +237,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index 35b203356b..46017dc698 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -91,7 +91,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_20.cc b/tests/matrix_free/matrix_vector_20.cc index 222147226a..05a6a32eb5 100644 --- a/tests/matrix_free/matrix_vector_20.cc +++ b/tests/matrix_free/matrix_vector_20.cc @@ -160,7 +160,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_21.cc b/tests/matrix_free/matrix_vector_21.cc index 649a500a73..4266bda748 100644 --- a/tests/matrix_free/matrix_vector_21.cc +++ b/tests/matrix_free/matrix_vector_21.cc @@ -150,7 +150,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_22.cc b/tests/matrix_free/matrix_vector_22.cc index 3464be724c..89ac7ef7d1 100644 --- a/tests/matrix_free/matrix_vector_22.cc +++ b/tests/matrix_free/matrix_vector_22.cc @@ -158,7 +158,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_23.cc b/tests/matrix_free/matrix_vector_23.cc index 10cefd8003..0fc5b02e96 100644 --- a/tests/matrix_free/matrix_vector_23.cc +++ b/tests/matrix_free/matrix_vector_23.cc @@ -170,7 +170,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_blocks.cc b/tests/matrix_free/matrix_vector_blocks.cc index fd4d8ddeee..abf99eca12 100644 --- a/tests/matrix_free/matrix_vector_blocks.cc +++ b/tests/matrix_free/matrix_vector_blocks.cc @@ -132,7 +132,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_common.h b/tests/matrix_free/matrix_vector_common.h index f9676bd1d2..2df716fbab 100644 --- a/tests/matrix_free/matrix_vector_common.h +++ b/tests/matrix_free/matrix_vector_common.h @@ -54,9 +54,9 @@ test(); template void -do_test(const DoFHandler & dof, - const ConstraintMatrix &constraints, - const unsigned int parallel_option = 0) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints, + const unsigned int parallel_option = 0) { deallog << "Testing " << dof.get_fe().get_name() << std::endl; if (parallel_option > 0) diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index b2f55d2604..62c4ce8856 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -142,7 +142,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; diff --git a/tests/matrix_free/matrix_vector_div.cc b/tests/matrix_free/matrix_vector_div.cc index fdaf14dfcb..d1f9c00332 100644 --- a/tests/matrix_free/matrix_vector_div.cc +++ b/tests/matrix_free/matrix_vector_div.cc @@ -138,7 +138,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; diff --git a/tests/matrix_free/matrix_vector_faces_01.cc b/tests/matrix_free/matrix_vector_faces_01.cc index ac866fec27..62ce23abc0 100644 --- a/tests/matrix_free/matrix_vector_faces_01.cc +++ b/tests/matrix_free/matrix_vector_faces_01.cc @@ -40,7 +40,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints, true); diff --git a/tests/matrix_free/matrix_vector_faces_02.cc b/tests/matrix_free/matrix_vector_faces_02.cc index 84f2d744d3..afa440fa88 100644 --- a/tests/matrix_free/matrix_vector_faces_02.cc +++ b/tests/matrix_free/matrix_vector_faces_02.cc @@ -67,7 +67,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // test with threads enabled as well diff --git a/tests/matrix_free/matrix_vector_faces_03.cc b/tests/matrix_free/matrix_vector_faces_03.cc index 7b3a18ae1c..3e076d10dc 100644 --- a/tests/matrix_free/matrix_vector_faces_03.cc +++ b/tests/matrix_free/matrix_vector_faces_03.cc @@ -69,7 +69,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // also test with threads diff --git a/tests/matrix_free/matrix_vector_faces_04.cc b/tests/matrix_free/matrix_vector_faces_04.cc index 62f1b64b70..a383b6f443 100644 --- a/tests/matrix_free/matrix_vector_faces_04.cc +++ b/tests/matrix_free/matrix_vector_faces_04.cc @@ -43,7 +43,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // test with threads enabled as well diff --git a/tests/matrix_free/matrix_vector_faces_05.cc b/tests/matrix_free/matrix_vector_faces_05.cc index 789bf67052..3b1bfc0afc 100644 --- a/tests/matrix_free/matrix_vector_faces_05.cc +++ b/tests/matrix_free/matrix_vector_faces_05.cc @@ -42,7 +42,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // test with threads enabled as well diff --git a/tests/matrix_free/matrix_vector_faces_06.cc b/tests/matrix_free/matrix_vector_faces_06.cc index 0bd0e808fa..1c3e776f39 100644 --- a/tests/matrix_free/matrix_vector_faces_06.cc +++ b/tests/matrix_free/matrix_vector_faces_06.cc @@ -65,7 +65,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); do_test(dof, constraints, true); diff --git a/tests/matrix_free/matrix_vector_faces_07.cc b/tests/matrix_free/matrix_vector_faces_07.cc index a242fc4a98..f2a64d4501 100644 --- a/tests/matrix_free/matrix_vector_faces_07.cc +++ b/tests/matrix_free/matrix_vector_faces_07.cc @@ -70,7 +70,7 @@ test() FE_DGQArbitraryNodes fe(QGauss<1>(fe_degree + 1)); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // also test with threads diff --git a/tests/matrix_free/matrix_vector_faces_08.cc b/tests/matrix_free/matrix_vector_faces_08.cc index cf72f27c66..8f4437a8ef 100644 --- a/tests/matrix_free/matrix_vector_faces_08.cc +++ b/tests/matrix_free/matrix_vector_faces_08.cc @@ -70,7 +70,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // also test with threads diff --git a/tests/matrix_free/matrix_vector_faces_09.cc b/tests/matrix_free/matrix_vector_faces_09.cc index 9a878952e8..b68858efc2 100644 --- a/tests/matrix_free/matrix_vector_faces_09.cc +++ b/tests/matrix_free/matrix_vector_faces_09.cc @@ -70,7 +70,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_10.cc b/tests/matrix_free/matrix_vector_faces_10.cc index bdfb9c1323..a7fde26d24 100644 --- a/tests/matrix_free/matrix_vector_faces_10.cc +++ b/tests/matrix_free/matrix_vector_faces_10.cc @@ -66,7 +66,7 @@ test() FE_DGQHermite fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_11.cc b/tests/matrix_free/matrix_vector_faces_11.cc index ab0ddc9204..dd13faca18 100644 --- a/tests/matrix_free/matrix_vector_faces_11.cc +++ b/tests/matrix_free/matrix_vector_faces_11.cc @@ -67,7 +67,7 @@ test() FE_DGQHermite fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_12.cc b/tests/matrix_free/matrix_vector_faces_12.cc index 1f459093ea..c58ec2df74 100644 --- a/tests/matrix_free/matrix_vector_faces_12.cc +++ b/tests/matrix_free/matrix_vector_faces_12.cc @@ -291,7 +291,7 @@ test() FE_DGQ fe(fe_degree); DoFHandler dof(triangulation); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // cannot test threads right now diff --git a/tests/matrix_free/matrix_vector_faces_13.cc b/tests/matrix_free/matrix_vector_faces_13.cc index dc237156fd..12094e5090 100644 --- a/tests/matrix_free/matrix_vector_faces_13.cc +++ b/tests/matrix_free/matrix_vector_faces_13.cc @@ -65,7 +65,7 @@ test() FE_DGQHermite fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_14.cc b/tests/matrix_free/matrix_vector_faces_14.cc index daa17610d8..c5120a553a 100644 --- a/tests/matrix_free/matrix_vector_faces_14.cc +++ b/tests/matrix_free/matrix_vector_faces_14.cc @@ -66,9 +66,9 @@ test() tria.refine_global(3 - dim); - FE_DGQHermite fe(fe_degree); - DoFHandler dof(tria); - ConstraintMatrix constraints; + FE_DGQHermite fe(fe_degree); + DoFHandler dof(tria); + AffineConstraints constraints; constraints.close(); for (unsigned int test = 0; test < 2; ++test) diff --git a/tests/matrix_free/matrix_vector_faces_15.cc b/tests/matrix_free/matrix_vector_faces_15.cc index b88aa9b78e..2bc35feb71 100644 --- a/tests/matrix_free/matrix_vector_faces_15.cc +++ b/tests/matrix_free/matrix_vector_faces_15.cc @@ -67,7 +67,7 @@ test() DoFHandler dof(tria); dof_orig.distribute_dofs(fe); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_16.cc b/tests/matrix_free/matrix_vector_faces_16.cc index 99aa86c4c5..85be228881 100644 --- a/tests/matrix_free/matrix_vector_faces_16.cc +++ b/tests/matrix_free/matrix_vector_faces_16.cc @@ -66,7 +66,7 @@ test() FE_DGQ fe(1); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_17.cc b/tests/matrix_free/matrix_vector_faces_17.cc index 5546f41820..a1feee7540 100644 --- a/tests/matrix_free/matrix_vector_faces_17.cc +++ b/tests/matrix_free/matrix_vector_faces_17.cc @@ -62,7 +62,7 @@ test() DoFHandler dof(tria); dof_orig.distribute_dofs(fe); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_18.cc b/tests/matrix_free/matrix_vector_faces_18.cc index aa51b97e64..ac54e2426b 100644 --- a/tests/matrix_free/matrix_vector_faces_18.cc +++ b/tests/matrix_free/matrix_vector_faces_18.cc @@ -154,7 +154,7 @@ test() DoFHandler dof(triangulation); dof_orig.distribute_dofs(fe); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_19.cc b/tests/matrix_free/matrix_vector_faces_19.cc index 5935b32b45..dd57db9387 100644 --- a/tests/matrix_free/matrix_vector_faces_19.cc +++ b/tests/matrix_free/matrix_vector_faces_19.cc @@ -65,7 +65,7 @@ test() FE_DGQHermite fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name(); diff --git a/tests/matrix_free/matrix_vector_faces_20.cc b/tests/matrix_free/matrix_vector_faces_20.cc index ef35da9443..b08e7cae78 100644 --- a/tests/matrix_free/matrix_vector_faces_20.cc +++ b/tests/matrix_free/matrix_vector_faces_20.cc @@ -68,11 +68,11 @@ test() tria.refine_global(3 - dim); - FE_DGQHermite fe(fe_degree); - FESystem fe_system(fe, dim); - DoFHandler dof(tria); - DoFHandler dof_system(tria); - ConstraintMatrix constraints; + FE_DGQHermite fe(fe_degree); + FESystem fe_system(fe, dim); + DoFHandler dof(tria); + DoFHandler dof_system(tria); + AffineConstraints constraints; constraints.close(); for (unsigned int test = 0; test < 3; ++test) diff --git a/tests/matrix_free/matrix_vector_faces_21.cc b/tests/matrix_free/matrix_vector_faces_21.cc index 856d13d4a9..65f04d3ab0 100644 --- a/tests/matrix_free/matrix_vector_faces_21.cc +++ b/tests/matrix_free/matrix_vector_faces_21.cc @@ -69,11 +69,11 @@ test() tria.refine_global(3 - dim); - FE_DGQHermite fe(fe_degree); - FESystem fe_system(fe, dim); - DoFHandler dof(tria); - DoFHandler dof_system(tria); - ConstraintMatrix constraints; + FE_DGQHermite fe(fe_degree); + FESystem fe_system(fe, dim); + DoFHandler dof(tria); + DoFHandler dof_system(tria); + AffineConstraints constraints; constraints.close(); for (unsigned int test = 0; test < 3; ++test) diff --git a/tests/matrix_free/matrix_vector_faces_22.cc b/tests/matrix_free/matrix_vector_faces_22.cc index 8dc018bf02..55ff404042 100644 --- a/tests/matrix_free/matrix_vector_faces_22.cc +++ b/tests/matrix_free/matrix_vector_faces_22.cc @@ -67,11 +67,11 @@ test() tria.refine_global(3 - dim); - FE_DGQ fe(fe_degree); - FESystem fe_system(fe, dim); - DoFHandler dof(tria); - DoFHandler dof_system(tria); - ConstraintMatrix constraints; + FE_DGQ fe(fe_degree); + FESystem fe_system(fe, dim); + DoFHandler dof(tria); + DoFHandler dof_system(tria); + AffineConstraints constraints; constraints.close(); for (unsigned int test = 0; test < 3; ++test) diff --git a/tests/matrix_free/matrix_vector_faces_23.cc b/tests/matrix_free/matrix_vector_faces_23.cc index 4a36f32100..5f5d566ed9 100644 --- a/tests/matrix_free/matrix_vector_faces_23.cc +++ b/tests/matrix_free/matrix_vector_faces_23.cc @@ -69,11 +69,11 @@ test() tria.refine_global(3 - dim); - FE_DGQ fe(fe_degree); - FESystem fe_system(fe, dim); - DoFHandler dof(tria); - DoFHandler dof_system(tria); - ConstraintMatrix constraints; + FE_DGQ fe(fe_degree); + FESystem fe_system(fe, dim); + DoFHandler dof(tria); + DoFHandler dof_system(tria); + AffineConstraints constraints; constraints.close(); for (unsigned int test = 0; test < 3; ++test) diff --git a/tests/matrix_free/matrix_vector_faces_common.h b/tests/matrix_free/matrix_vector_faces_common.h index e4ae6b71be..6054c09199 100644 --- a/tests/matrix_free/matrix_vector_faces_common.h +++ b/tests/matrix_free/matrix_vector_faces_common.h @@ -658,9 +658,9 @@ MatrixIntegrator::boundary( template void -do_test(const DoFHandler & dof, - const ConstraintMatrix &constraints, - const bool also_test_parallel = false) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints, + const bool also_test_parallel = false) { if (types_are_equal::value == true) deallog.push("float"); diff --git a/tests/matrix_free/matrix_vector_float.cc b/tests/matrix_free/matrix_vector_float.cc index 9c6f6ba285..10f9251715 100644 --- a/tests/matrix_free/matrix_vector_float.cc +++ b/tests/matrix_free/matrix_vector_float.cc @@ -64,7 +64,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index 81653f494b..281796ef05 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -166,7 +166,7 @@ test() // setup DoFs dof.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_large_degree_01.cc b/tests/matrix_free/matrix_vector_large_degree_01.cc index b7bfbe5141..8610b65a21 100644 --- a/tests/matrix_free/matrix_vector_large_degree_01.cc +++ b/tests/matrix_free/matrix_vector_large_degree_01.cc @@ -52,7 +52,7 @@ test() FE_Q fe(fe_degree); DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name() << std::endl; diff --git a/tests/matrix_free/matrix_vector_large_degree_02.cc b/tests/matrix_free/matrix_vector_large_degree_02.cc index 7c9aa72ba0..db37da936a 100644 --- a/tests/matrix_free/matrix_vector_large_degree_02.cc +++ b/tests/matrix_free/matrix_vector_large_degree_02.cc @@ -75,7 +75,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index 924c4c67ce..37c0f13ef0 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -56,7 +56,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); dof.distribute_mg_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; VectorTools::interpolate_boundary_values(dof, 0, Functions::ZeroFunction(), @@ -85,12 +85,12 @@ test() system_matrix.reinit(sparsity); // setup MG levels - const unsigned int nlevels = tria.n_levels(); - typedef MatrixFree MatrixFreeTestType; - MGLevelObject mg_matrices; - MGLevelObject mg_constraints; - MGLevelObject mg_sparsities; - MGLevelObject> mg_ref_matrices; + const unsigned int nlevels = tria.n_levels(); + typedef MatrixFree MatrixFreeTestType; + MGLevelObject mg_matrices; + MGLevelObject> mg_constraints; + MGLevelObject mg_sparsities; + MGLevelObject> mg_ref_matrices; mg_matrices.resize(0, nlevels - 1); mg_constraints.resize(0, nlevels - 1); mg_sparsities.resize(0, nlevels - 1); diff --git a/tests/matrix_free/matrix_vector_stokes.cc b/tests/matrix_free/matrix_vector_stokes.cc index 4127885708..1f20c774a4 100644 --- a/tests/matrix_free/matrix_vector_stokes.cc +++ b/tests/matrix_free/matrix_vector_stokes.cc @@ -145,7 +145,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -282,9 +282,9 @@ test() std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - ConstraintMatrix dummy_constraints; + AffineConstraints dummy_constraints; dummy_constraints.close(); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/matrix_vector_stokes_base.cc b/tests/matrix_free/matrix_vector_stokes_base.cc index 6486f5fb1b..c4469f0d2e 100644 --- a/tests/matrix_free/matrix_vector_stokes_base.cc +++ b/tests/matrix_free/matrix_vector_stokes_base.cc @@ -128,7 +128,7 @@ test() std::shared_ptr> mf_data; dof.distribute_dofs(fe); - ConstraintMatrix constraints, constraints_u, constraints_p; + AffineConstraints constraints, constraints_u, constraints_p; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -261,7 +261,7 @@ test() std::vector *> dofs; dofs.push_back(&dof_u); dofs.push_back(&dof_p); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&constraints_u); constraints.push_back(&constraints_p); QGauss<1> quad(degree + 2); diff --git a/tests/matrix_free/matrix_vector_stokes_flux.cc b/tests/matrix_free/matrix_vector_stokes_flux.cc index 4dd9762585..6dde5249e8 100644 --- a/tests/matrix_free/matrix_vector_stokes_flux.cc +++ b/tests/matrix_free/matrix_vector_stokes_flux.cc @@ -146,7 +146,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index fa180d96a4..bd6650b1ca 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -152,7 +152,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints, constraints_u, constraints_p; + AffineConstraints constraints, constraints_u, constraints_p; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -301,7 +301,7 @@ test() std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&constraints_u); constraints.push_back(&constraints_p); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/matrix_vector_stokes_notempl.cc b/tests/matrix_free/matrix_vector_stokes_notempl.cc index 7b745c9524..008795ed05 100644 --- a/tests/matrix_free/matrix_vector_stokes_notempl.cc +++ b/tests/matrix_free/matrix_vector_stokes_notempl.cc @@ -148,7 +148,7 @@ test(const unsigned int fe_degree) MatrixFree mf_data; - ConstraintMatrix constraints, constraints_u, constraints_p; + AffineConstraints constraints, constraints_u, constraints_p; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -297,7 +297,7 @@ test(const unsigned int fe_degree) std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&constraints_u); constraints.push_back(&constraints_p); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/matrix_vector_stokes_onedof.cc b/tests/matrix_free/matrix_vector_stokes_onedof.cc index 8ee4fad556..9dc414bd5a 100644 --- a/tests/matrix_free/matrix_vector_stokes_onedof.cc +++ b/tests/matrix_free/matrix_vector_stokes_onedof.cc @@ -151,7 +151,7 @@ test(const FESystem &fe) MatrixFree mf_data; - ConstraintMatrix constraints, constraints_u, constraints_p; + AffineConstraints constraints, constraints_u, constraints_p; SparsityPattern sparsity_pattern; SparseMatrix system_matrix; diff --git a/tests/matrix_free/matrix_vector_stokes_qdg0.cc b/tests/matrix_free/matrix_vector_stokes_qdg0.cc index ee32de1d36..a5bf54c394 100644 --- a/tests/matrix_free/matrix_vector_stokes_qdg0.cc +++ b/tests/matrix_free/matrix_vector_stokes_qdg0.cc @@ -147,7 +147,7 @@ test() MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -284,9 +284,9 @@ test() std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - ConstraintMatrix dummy_constraints; + AffineConstraints dummy_constraints; dummy_constraints.close(); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/matrix_vector_stokes_qdg0b.cc b/tests/matrix_free/matrix_vector_stokes_qdg0b.cc index fa25565779..7b47c103f5 100644 --- a/tests/matrix_free/matrix_vector_stokes_qdg0b.cc +++ b/tests/matrix_free/matrix_vector_stokes_qdg0b.cc @@ -144,7 +144,7 @@ test(const unsigned int fe_degree) MatrixFree mf_data; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix system_matrix; @@ -281,9 +281,9 @@ test(const unsigned int fe_degree) std::vector *> dofs; dofs.push_back(&dof_handler_u); dofs.push_back(&dof_handler_p); - ConstraintMatrix dummy_constraints; + AffineConstraints dummy_constraints; dummy_constraints.close(); - std::vector constraints; + std::vector *> constraints; constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); diff --git a/tests/matrix_free/multigrid_dg_periodic.cc b/tests/matrix_free/multigrid_dg_periodic.cc index 90dc4fb659..79199c7c12 100644 --- a/tests/matrix_free/multigrid_dg_periodic.cc +++ b/tests/matrix_free/multigrid_dg_periodic.cc @@ -82,7 +82,7 @@ public: (update_gradients | update_JxW_values); addit_data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); data.reinit(mapping, dof_handler, constraints, quad, addit_data); diff --git a/tests/matrix_free/multigrid_dg_sip_01.cc b/tests/matrix_free/multigrid_dg_sip_01.cc index 48c48b2441..5c65da9159 100644 --- a/tests/matrix_free/multigrid_dg_sip_01.cc +++ b/tests/matrix_free/multigrid_dg_sip_01.cc @@ -81,7 +81,7 @@ public: (update_gradients | update_JxW_values); addit_data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); data.reinit(mapping, dof_handler, constraints, quad, addit_data); diff --git a/tests/matrix_free/multigrid_dg_sip_02.cc b/tests/matrix_free/multigrid_dg_sip_02.cc index 29d6a61558..3afcea7283 100644 --- a/tests/matrix_free/multigrid_dg_sip_02.cc +++ b/tests/matrix_free/multigrid_dg_sip_02.cc @@ -84,7 +84,7 @@ public: update_JxW_values | update_normal_vectors | update_jacobians; addit_data.mapping_update_flags_faces_by_cells = update_JxW_values | update_normal_vectors | update_jacobians; - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); data.reinit(mapping, dof_handler, constraints, quad, addit_data); diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index 9738ed81cf..01e9952e93 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -118,7 +118,8 @@ protected: template void -do_test(const DoFHandler &dof, const ConstraintMatrix &constraints) +do_test(const DoFHandler & dof, + const AffineConstraints &constraints) { // use this for info on problem // std::cout << "Number of cells: " << @@ -204,7 +205,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index 4de10c0d43..f4ca2503d9 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -74,7 +74,7 @@ public: addit_data.level_mg_handler = level; // extract the constraints due to Dirichlet boundary conditions - ConstraintMatrix constraints; + AffineConstraints constraints; Functions::ZeroFunction zero; std::map *> functions; for (std::set::const_iterator it = diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 7d7b4962df..30c1a778b9 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -108,7 +108,7 @@ do_test(const DoFHandler &dof) dirichlet_boundary[0] = &zero_function; // fine-level constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, @@ -172,8 +172,8 @@ do_test(const DoFHandler &dof) MatrixFree::AdditionalData::none; mg_additional_data.level_mg_handler = level; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs); level_constraints.reinit(relevant_dofs); level_constraints.add_lines( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index 3f3e2043f5..f22561aeb9 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -76,7 +76,7 @@ public: MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; addit_data.level_mg_handler = level; - ConstraintMatrix constraints; + AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { IndexSet relevant_dofs; @@ -507,8 +507,8 @@ do_test(const DoFHandler &dof) deallog << std::endl; deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; - ConstraintMatrix hanging_node_constraints; - IndexSet locally_relevant_dofs; + AffineConstraints hanging_node_constraints; + IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index 22bed12595..4331103dd9 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -145,7 +145,7 @@ do_test(const DoFHandler &dof) dirichlet_boundary[0] = &zero_function; // fine-level constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, @@ -189,7 +189,7 @@ do_test(const DoFHandler &dof) // set constant rhs vector { // this is to make it consistent with parallel_multigrid_adaptive.cc - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -222,8 +222,8 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_block_size = 3; mg_additional_data.level_mg_handler = level; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs); level_constraints.reinit(relevant_dofs); level_constraints.add_lines( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index d0bdb75227..27f4895027 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -82,7 +82,7 @@ public: MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; addit_data.level_mg_handler = level; - ConstraintMatrix constraints; + AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { IndexSet relevant_dofs; @@ -514,8 +514,8 @@ do_test(const DoFHandler &dof, const bool threaded) deallog << std::endl; deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; - ConstraintMatrix hanging_node_constraints; - IndexSet locally_relevant_dofs; + AffineConstraints hanging_node_constraints; + IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index d92a6aaa07..ee68fbb7a0 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -145,7 +145,7 @@ do_test(const DoFHandler &dof) dirichlet_boundary[0] = &zero_function; // fine-level constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, @@ -189,7 +189,7 @@ do_test(const DoFHandler &dof) // set constant rhs vector { // this is to make it consistent with parallel_multigrid_adaptive.cc - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -222,8 +222,8 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_block_size = 3; mg_additional_data.level_mg_handler = level; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs); level_constraints.reinit(relevant_dofs); level_constraints.add_lines( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc index d22ff0af53..99216ffc32 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc @@ -79,7 +79,7 @@ public: MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; addit_data.level_mg_handler = level; - ConstraintMatrix constraints; + AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { IndexSet relevant_dofs; @@ -511,8 +511,8 @@ do_test(const DoFHandler &dof, const bool threaded) deallog << std::endl; deallog << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; - ConstraintMatrix hanging_node_constraints; - IndexSet locally_relevant_dofs; + AffineConstraints hanging_node_constraints; + IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index 74f87b3f87..47ba3889e8 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06.cc @@ -230,7 +230,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) dirichlet_boundary[0] = &zero_function; // fine-level constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, @@ -278,7 +278,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) // set constant rhs vector { // this is to make it consistent with parallel_multigrid_adaptive.cc - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -313,8 +313,8 @@ do_test(const DoFHandler &dof, const unsigned int nb) mg_additional_data.tasks_block_size = 3; mg_additional_data.level_mg_handler = level; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs); level_constraints.reinit(relevant_dofs); level_constraints.add_lines( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index e39c034fd8..ec5293a713 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -146,7 +146,7 @@ do_test(const DoFHandler &dof) dirichlet_boundary[0] = &zero_function; // fine-level constraints - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, @@ -190,7 +190,7 @@ do_test(const DoFHandler &dof) // set constant rhs vector { // this is to make it consistent with parallel_multigrid_adaptive.cc - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; hanging_node_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -223,8 +223,8 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_block_size = 3; mg_additional_data.level_mg_handler = level; - ConstraintMatrix level_constraints; - IndexSet relevant_dofs; + AffineConstraints level_constraints; + IndexSet relevant_dofs; DoFTools::extract_locally_relevant_level_dofs(dof, level, relevant_dofs); level_constraints.reinit(relevant_dofs); level_constraints.add_lines( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index bdf54bb181..83c1285c4e 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -248,8 +248,8 @@ do_test(const std::vector *> &dof) dirichlet_boundary[0] = &zero_function; // fine-level constraints - std::vector constraints(dof.size()); - std::vector constraints_ptrs(dof.size()); + std::vector> constraints(dof.size()); + std::vector *> constraints_ptrs(dof.size()); for (unsigned int i = 0; i < dof.size(); ++i) { constraints[i].reinit(locally_relevant_dofs[i]); @@ -299,7 +299,7 @@ do_test(const std::vector *> &dof) for (unsigned int b = 0; b < nb; ++b) { // this is to make it consistent with parallel_multigrid_adaptive.cc - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; hanging_node_constraints.reinit(locally_relevant_dofs[b]); DoFTools::make_hanging_node_constraints(*dof[b], @@ -340,8 +340,9 @@ do_test(const std::vector *> &dof) mg_additional_data.tasks_block_size = 3; mg_additional_data.level_mg_handler = level; - std::vector level_constraints(dof.size()); - std::vector level_constraints_ptrs(dof.size()); + std::vector> level_constraints(dof.size()); + std::vector *> level_constraints_ptrs( + dof.size()); for (unsigned int i = 0; i < dof.size(); ++i) { IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index 0aabeca98c..bab7e2cd47 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -73,7 +73,7 @@ public: addit_data.level_mg_handler = level; // extract the constraints due to Dirichlet boundary conditions - ConstraintMatrix constraints; + AffineConstraints constraints; Functions::ZeroFunction zero; std::map *> functions; for (std::set::const_iterator it = diff --git a/tests/matrix_free/quadrature_points.cc b/tests/matrix_free/quadrature_points.cc index 94f8224e99..6397662cdd 100644 --- a/tests/matrix_free/quadrature_points.cc +++ b/tests/matrix_free/quadrature_points.cc @@ -70,7 +70,7 @@ test() // std::cout << "Number of cells: " << tria.n_active_cells() << std::endl; // std::cout << "Number of degrees of freedom: " << dof.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index ace6dc8942..c6a590ef88 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -224,10 +224,10 @@ namespace Step48 #else Triangulation triangulation; #endif - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix constraints; - IndexSet locally_relevant_dofs; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints constraints; + IndexSet locally_relevant_dofs; MatrixFree matrix_free_data; diff --git a/tests/matrix_free/step-48b.cc b/tests/matrix_free/step-48b.cc index 31b6d66ddb..b8106a0c5b 100644 --- a/tests/matrix_free/step-48b.cc +++ b/tests/matrix_free/step-48b.cc @@ -220,11 +220,11 @@ namespace Step48 void output_norm(); - Triangulation triangulation; - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix constraints; - IndexSet locally_relevant_dofs; + Triangulation triangulation; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints constraints; + IndexSet locally_relevant_dofs; MatrixFree matrix_free_data; diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index 0fc5dcf055..8a7c492841 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -212,10 +212,10 @@ namespace Step48 #else Triangulation triangulation; #endif - FE_Q fe; - DoFHandler dof_handler; - ConstraintMatrix constraints; - IndexSet locally_relevant_dofs; + FE_Q fe; + DoFHandler dof_handler; + AffineConstraints constraints; + IndexSet locally_relevant_dofs; MatrixFree matrix_free_data; diff --git a/tests/matrix_free/stokes_computation.cc b/tests/matrix_free/stokes_computation.cc index 2252ecd56b..0f742e65d1 100644 --- a/tests/matrix_free/stokes_computation.cc +++ b/tests/matrix_free/stokes_computation.cc @@ -960,8 +960,8 @@ namespace StokesClass std::vector owned_partitioning; std::vector relevant_partitioning; - ConstraintMatrix constraints_u; - ConstraintMatrix constraints_p; + AffineConstraints constraints_u; + AffineConstraints constraints_p; block_vector_t solution; block_vector_t system_rhs; @@ -1071,7 +1071,7 @@ namespace StokesClass std::vector *> stokes_dofs; stokes_dofs.push_back(&dof_handler_u); stokes_dofs.push_back(&dof_handler_p); - std::vector stokes_constraints; + std::vector *> stokes_constraints; stokes_constraints.push_back(&constraints_u); stokes_constraints.push_back(&constraints_p); @@ -1122,7 +1122,7 @@ namespace StokesClass DoFTools::extract_locally_relevant_level_dofs(dof_handler_u, level, relevant_dofs); - ConstraintMatrix level_constraints; + AffineConstraints level_constraints; level_constraints.reinit(relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); @@ -1177,8 +1177,8 @@ namespace StokesClass update_JxW_values | update_quadrature_points); // Create constraints with no Dirchlet info - ConstraintMatrix constraints_u_no_dirchlet; - IndexSet locally_relevant_dofs_u; + AffineConstraints constraints_u_no_dirchlet; + IndexSet locally_relevant_dofs_u; DoFTools::extract_locally_relevant_dofs(dof_handler_u, locally_relevant_dofs_u); constraints_u_no_dirchlet.reinit(locally_relevant_dofs_u); @@ -1186,7 +1186,7 @@ namespace StokesClass constraints_u_no_dirchlet); constraints_u_no_dirchlet.close(); - std::vector constraints_no_dirchlet; + std::vector *> constraints_no_dirchlet; constraints_no_dirchlet.push_back(&constraints_u_no_dirchlet); constraints_no_dirchlet.push_back(&constraints_p); std::vector *> dofs; diff --git a/tests/matrix_free/thread_correctness.cc b/tests/matrix_free/thread_correctness.cc index b12277cab3..3cb881996c 100644 --- a/tests/matrix_free/thread_correctness.cc +++ b/tests/matrix_free/thread_correctness.cc @@ -70,7 +70,7 @@ sub_test() tria.execute_coarsening_and_refinement(); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/thread_correctness_dg.cc b/tests/matrix_free/thread_correctness_dg.cc index bca548198c..81fe436714 100644 --- a/tests/matrix_free/thread_correctness_dg.cc +++ b/tests/matrix_free/thread_correctness_dg.cc @@ -73,7 +73,7 @@ sub_test() tria.execute_coarsening_and_refinement(); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); // std::cout << "Number of cells: " << diff --git a/tests/matrix_free/thread_correctness_hp.cc b/tests/matrix_free/thread_correctness_hp.cc index 169bdd83bd..50fcdc14d0 100644 --- a/tests/matrix_free/thread_correctness_hp.cc +++ b/tests/matrix_free/thread_correctness_hp.cc @@ -131,7 +131,7 @@ do_test(const unsigned int parallel_option) // setup DoFs dof.distribute_dofs(fe_collection); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/update_mapping_only.cc b/tests/matrix_free/update_mapping_only.cc index 2c1f75441f..210d703274 100644 --- a/tests/matrix_free/update_mapping_only.cc +++ b/tests/matrix_free/update_mapping_only.cc @@ -41,7 +41,7 @@ test() DoFHandler dof(tria); dof.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.close(); deallog << "Testing " << dof.get_fe().get_name() << std::endl; diff --git a/tests/meshworker/step-11-mesh_loop.cc b/tests/meshworker/step-11-mesh_loop.cc index 9b4c8be1fb..3fddc06c29 100644 --- a/tests/meshworker/step-11-mesh_loop.cc +++ b/tests/meshworker/step-11-mesh_loop.cc @@ -100,9 +100,9 @@ namespace Step11 DoFHandler dof_handler; MappingQ mapping; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - ConstraintMatrix constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + AffineConstraints constraints; Vector solution; Vector system_rhs; diff --git a/tests/meshworker/step-50-mesh_loop.cc b/tests/meshworker/step-50-mesh_loop.cc index b96594ea29..061d3844f0 100644 --- a/tests/meshworker/step-50-mesh_loop.cc +++ b/tests/meshworker/step-50-mesh_loop.cc @@ -152,7 +152,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -362,7 +362,7 @@ namespace Step50 void LaplaceProblem::assemble_system_and_multigrid() { - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) diff --git a/tests/mpi/condense_01.cc b/tests/mpi/condense_01.cc index 7cff32f43b..b90088b7a8 100644 --- a/tests/mpi/condense_01.cc +++ b/tests/mpi/condense_01.cc @@ -15,7 +15,7 @@ -// test ConstraintMatrix::condense(in, out) +// test AffineConstraints::condense(in, out) #include #include diff --git a/tests/mpi/constraint_matrix_condense_01.cc b/tests/mpi/constraint_matrix_condense_01.cc index 25a104b60c..8707c12e20 100644 --- a/tests/mpi/constraint_matrix_condense_01.cc +++ b/tests/mpi/constraint_matrix_condense_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix::condense(Vector) for parallel vectors. this +// check AffineConstraints::condense(Vector) for parallel vectors. this // function used to crash // // original test case by Daniel Arndt diff --git a/tests/mpi/constraint_matrix_crash_01.cc b/tests/mpi/constraint_matrix_crash_01.cc index ab7191a08d..32ae145e2d 100644 --- a/tests/mpi/constraint_matrix_crash_01.cc +++ b/tests/mpi/constraint_matrix_crash_01.cc @@ -15,8 +15,8 @@ -// ConstraintMatrix::add_line crashes in release mode (missing compress inside -// ConstraintMatrix) +// AffineConstraints::add_line crashes in release mode (missing compress +// inside AffineConstraints) #include @@ -39,7 +39,7 @@ test() local_active_together.add_range(0, 3); // local_active_together.compress(); - ConstraintMatrix cm(local_active_together); + AffineConstraints cm(local_active_together); cm.add_line(1); cm.close(); deallog << "OK" << std::endl; diff --git a/tests/mpi/constraint_matrix_set_zero_01.cc b/tests/mpi/constraint_matrix_set_zero_01.cc index 215aa2a8df..70d83806b2 100644 --- a/tests/mpi/constraint_matrix_set_zero_01.cc +++ b/tests/mpi/constraint_matrix_set_zero_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix::set_zero(Vector) for parallel vectors. +// check AffineConstraints::set_zero(Vector) for parallel vectors. // this documents a bug introduced in r29678 for block vectors // that was fixed in 29940. diff --git a/tests/mpi/constraint_matrix_set_zero_02.cc b/tests/mpi/constraint_matrix_set_zero_02.cc index 18c13e4da1..fb01253382 100644 --- a/tests/mpi/constraint_matrix_set_zero_02.cc +++ b/tests/mpi/constraint_matrix_set_zero_02.cc @@ -15,7 +15,8 @@ -// check ConstraintMatrix::set_zero(Vector) for parallel distributed vectors +// check AffineConstraints::set_zero(Vector) for parallel distributed +// vectors #include @@ -61,7 +62,7 @@ test() local_active_together.add_range(myid, myid + 1); local_active_together.add_range(numproc + myid * 2, numproc + myid * 2 + 2); - ConstraintMatrix cm(local_active_together); + AffineConstraints cm(local_active_together); cm.add_line(numproc + myid * 2); cm.close(); diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc index e1fe6b3309..e74c83c379 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -15,8 +15,8 @@ -// ConstraintMatrix.distribute() produces a different result when using a -// Trilinos::Vector with ghost elements (e.g. owned vs. active), which is a +// AffineConstraints.distribute() produces a different result when using +// a Trilinos::Vector with ghost elements (e.g. owned vs. active), which is a // bug. Now distribute() throws an Exception when called with a Vector with // ghost elements. check that this happens. @@ -92,7 +92,7 @@ test() TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); std::vector velocity_mask(dim + 1, true); diff --git a/tests/mpi/constraints_consistent_01.cc b/tests/mpi/constraints_consistent_01.cc index 1ffde3af4e..e79143a77d 100644 --- a/tests/mpi/constraints_consistent_01.cc +++ b/tests/mpi/constraints_consistent_01.cc @@ -15,7 +15,7 @@ -// test ConstraintMatrix::is_consistent_in_parallel +// test AffineConstraints::is_consistent_in_parallel #include @@ -58,7 +58,7 @@ check(parallel::distributed::Triangulation &tria) IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.clear(); constraints.reinit(locally_relevant_dofs); diff --git a/tests/mpi/crash_05.cc b/tests/mpi/crash_05.cc index 26a86229b4..61e409adcf 100644 --- a/tests/mpi/crash_05.cc +++ b/tests/mpi/crash_05.cc @@ -22,10 +22,10 @@ 905: An error occurred in line <1898> of file in function 905: void -dealii::ConstraintMatrix::add_line(dealii::ConstraintMatrix::size_type) 905: The -violated condition was: 905: line != numbers::invalid_size_type 905: The -name and call sequence of the exception was: 905: ExcInternalError() 905: -Additional Information: 905: (none) 905: +dealii::AffineConstraints::add_line(dealii::AffineConstraints::size_type) +905: The violated condition was: 905: line != numbers::invalid_size_type +905: The name and call sequence of the exception was: 905: ExcInternalError() +905: Additional Information: 905: (none) 905: -------------------------------------------------------- */ @@ -74,7 +74,7 @@ test() dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); IndexSet relevant_set; diff --git a/tests/mpi/crash_06.cc b/tests/mpi/crash_06.cc index b3c0466afd..4c0055c191 100644 --- a/tests/mpi/crash_06.cc +++ b/tests/mpi/crash_06.cc @@ -68,7 +68,7 @@ test(FiniteElement &fe) dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) diff --git a/tests/mpi/data_out_faces_01.cc b/tests/mpi/data_out_faces_01.cc index 9311f2e0f3..d6b98c6e69 100644 --- a/tests/mpi/data_out_faces_01.cc +++ b/tests/mpi/data_out_faces_01.cc @@ -72,7 +72,7 @@ namespace pdd IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::Vector locally_relevant_solution; }; diff --git a/tests/mpi/fe_tools_extrapolate_common.h b/tests/mpi/fe_tools_extrapolate_common.h index fe0150822e..a07afb29c0 100644 --- a/tests/mpi/fe_tools_extrapolate_common.h +++ b/tests/mpi/fe_tools_extrapolate_common.h @@ -193,10 +193,10 @@ check_this(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm1; + AffineConstraints cm1; DoFTools::make_hanging_node_constraints(*dof1, cm1); cm1.close(); - ConstraintMatrix cm2; + AffineConstraints cm2; DoFTools::make_hanging_node_constraints(*dof2, cm2); cm2.close(); @@ -324,10 +324,10 @@ check_this_dealii(const FiniteElement &fe1, const FiniteElement &fe2) std::unique_ptr> dof1(make_dof_handler(*tria, fe1)); std::unique_ptr> dof2(make_dof_handler(*tria, fe2)); - ConstraintMatrix cm1; + AffineConstraints cm1; DoFTools::make_hanging_node_constraints(*dof1, cm1); cm1.close(); - ConstraintMatrix cm2; + AffineConstraints cm2; DoFTools::make_hanging_node_constraints(*dof2, cm2); cm2.close(); diff --git a/tests/mpi/hp_step-40.cc b/tests/mpi/hp_step-40.cc index 97827465d6..2e4ebbc9ef 100644 --- a/tests/mpi/hp_step-40.cc +++ b/tests/mpi/hp_step-40.cc @@ -97,7 +97,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/interpolate_to_different_mesh_02.cc b/tests/mpi/interpolate_to_different_mesh_02.cc index df29a858e7..6c3f8379ab 100644 --- a/tests/mpi/interpolate_to_different_mesh_02.cc +++ b/tests/mpi/interpolate_to_different_mesh_02.cc @@ -68,7 +68,7 @@ private: FE_Q fe; IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; TrilinosWrappers::MPI::Vector locally_relevant_solution; TrilinosWrappers::MPI::Vector interpolated_locally_relevant_solution; diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc index 44859cd199..da1dc70c2d 100644 --- a/tests/mpi/make_zero_boundary_values.cc +++ b/tests/mpi/make_zero_boundary_values.cc @@ -44,7 +44,7 @@ test() dofh.distribute_dofs(fe); { - ConstraintMatrix boundary_values; + AffineConstraints boundary_values; DoFTools::make_zero_boundary_constraints(dofh, boundary_values); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) boundary_values.print(deallog.get_file_stream()); @@ -55,7 +55,7 @@ test() { IndexSet relevant_set(dofh.n_dofs()); DoFTools::extract_locally_relevant_dofs(dofh, relevant_set); - ConstraintMatrix boundary_values(relevant_set); + AffineConstraints boundary_values(relevant_set); DoFTools::make_zero_boundary_constraints(dofh, boundary_values); if (Utilities::MPI::this_mpi_process(MPI_COMM_WORLD) == 0) boundary_values.print(deallog.get_file_stream()); diff --git a/tests/mpi/muelu_periodicity.cc b/tests/mpi/muelu_periodicity.cc index 4ed552bb3d..9e49099e4a 100644 --- a/tests/mpi/muelu_periodicity.cc +++ b/tests/mpi/muelu_periodicity.cc @@ -88,9 +88,9 @@ namespace Step22 FESystem fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - std::vector owned_partitioning; - std::vector relevant_partitioning; + AffineConstraints constraints; + std::vector owned_partitioning; + std::vector relevant_partitioning; TrilinosWrappers::BlockSparsityPattern sparsity_pattern; TrilinosWrappers::BlockSparseMatrix system_matrix; diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index f73820a02d..9ce3bc7b66 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -99,7 +99,7 @@ namespace Step50 matrix_t system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -323,9 +323,9 @@ namespace Step50 const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { boundary_constraints[level].add_lines( diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc index 39dad0705e..32925e848f 100644 --- a/tests/mpi/multigrid_uniform.cc +++ b/tests/mpi/multigrid_uniform.cc @@ -99,7 +99,7 @@ namespace Step50 matrix_t system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -323,9 +323,9 @@ namespace Step50 const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_levels()); - std::vector boundary_interface_constraints( + std::vector> boundary_interface_constraints( triangulation.n_levels()); for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc index 1567ec26d1..73ad0ebe69 100644 --- a/tests/mpi/no_flux_constraints.cc +++ b/tests/mpi/no_flux_constraints.cc @@ -15,9 +15,9 @@ -// check ConstraintMatrix for a distributed mesh on hyper shell with both -// hanging nodes and no-normal-flux constraints on the outer boundary of the -// shell. +// check AffineConstraints for a distributed mesh on hyper shell with +// both hanging nodes and no-normal-flux constraints on the outer boundary of +// the shell. #include @@ -109,7 +109,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, relevant_set); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc index e20b3bbeb1..843204a5a4 100644 --- a/tests/mpi/no_flux_constraints_02.cc +++ b/tests/mpi/no_flux_constraints_02.cc @@ -15,10 +15,9 @@ -// check ConstraintMatrix for a distributed mesh on hyper shell with both -// hanging nodes and no-normal-flux constraints on the outer boundary of the -// shell. -// Also see test renumber_z_order_02 +// check AffineConstraints for a distributed mesh on hyper shell with +// both hanging nodes and no-normal-flux constraints on the outer boundary of +// the shell. Also see test renumber_z_order_02 #include @@ -112,7 +111,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, relevant_set); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc index 8e3f5aea02..377abd1dcf 100644 --- a/tests/mpi/no_flux_constraints_03.cc +++ b/tests/mpi/no_flux_constraints_03.cc @@ -15,9 +15,9 @@ -// check that the ConstraintMatrix with hanging nodes and no-normal-flux -// constraints on an adaptively refined hyper_cube are the same independet -// of the number of CPUs +// check that the AffineConstraints with hanging nodes and +// no-normal-flux constraints on an adaptively refined hyper_cube are the same +// independet of the number of CPUs #include @@ -87,7 +87,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, relevant_set); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc index 3ad5237c59..51d04fc127 100644 --- a/tests/mpi/normal_flux_constraints.cc +++ b/tests/mpi/normal_flux_constraints.cc @@ -15,8 +15,8 @@ -// check ConstraintMatrix for a distributed mesh on hyper shell with both -// hanging nodes and normal-flux constraints on the outer boundary of the +// check AffineConstraints for a distributed mesh on hyper shell with +// both hanging nodes and normal-flux constraints on the outer boundary of the // shell. #include @@ -108,7 +108,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, relevant_set); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index 59bcca1917..6ef25316bc 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix for a distributed mesh, +// check AffineConstraints for a distributed mesh, // also compare with/without sparse line_cache via IndexSet. // Simple mesh. @@ -64,9 +64,9 @@ test() IndexSet dof_set; DoFTools::extract_locally_relevant_dofs(dofh, dof_set); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - ConstraintMatrix cm2(dof_set); + AffineConstraints cm2(dof_set); DoFTools::make_hanging_node_constraints(dofh, cm2); { diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc index 28b5110967..f56ce5b467 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix for a distributed mesh, +// check AffineConstraints for a distributed mesh, // also compare with/without sparse line_cache via IndexSet. // Refine one corner. @@ -66,9 +66,9 @@ test() IndexSet dof_set; DoFTools::extract_locally_relevant_dofs(dofh, dof_set); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - ConstraintMatrix cm2(dof_set); + AffineConstraints cm2(dof_set); DoFTools::make_hanging_node_constraints(dofh, cm2); if (myid == 0) diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index 05cb398ea2..cd673308f9 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a distributed mesh +// check AffineConstraints.distribute() for a distributed mesh // with Trilinos // Mesh: shell with random refinement @@ -104,7 +104,7 @@ test() TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); std::vector velocity_mask(dim + 1, true); diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index 6a7c138306..c2f7d4bcc2 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a distributed mesh +// check AffineConstraints.distribute() for a distributed mesh // with Trilinos; manual check of the graphical output... // Mesh: shell with random refinement @@ -253,7 +253,7 @@ test() x_rel.reinit(relevant_set, MPI_COMM_WORLD); - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); /* std::vector velocity_mask (dim+1, true); diff --git a/tests/mpi/p4est_2d_constraintmatrix_05.cc b/tests/mpi/p4est_2d_constraintmatrix_05.cc index 863100f1b7..03338954f3 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_05.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc @@ -15,7 +15,7 @@ -// check that ConstraintMatrix.distribute() is not doing anything in a +// check that AffineConstraints.distribute() is not doing anything in a // distributed computation for a vector that already has the entries set // correctly @@ -68,10 +68,10 @@ test() TrilinosWrappers::MPI::Vector x1(x_ref); // we have interpolated values, so - // ConstraintMatrix::distribute should not do + // AffineConstraints::distribute should not do // anything x1 = x_ref; - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); cm.close(); cm.distribute(x1); diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc index 0455854cc7..c152ee4452 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix for a distributed mesh, +// check AffineConstraints for a distributed mesh, // also compare with/without sparse line_cache via IndexSet. // Mesh: 3d Random refinement. @@ -74,9 +74,9 @@ test() IndexSet dof_set; DoFTools::extract_locally_relevant_dofs(dofh, dof_set); - ConstraintMatrix cm; + AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - ConstraintMatrix cm2(dof_set); + AffineConstraints cm2(dof_set); DoFTools::make_hanging_node_constraints(dofh, cm2); { diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc index 2ecd7a7836..5deec6e44a 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a distributed mesh +// check AffineConstraints.distribute() for a distributed mesh // with Trilinos #include @@ -87,7 +87,7 @@ test() TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); cm.close(); diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index 3653a31ce7..c205e6aaee 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a distributed mesh +// check AffineConstraints.distribute() for a distributed mesh // with Trilinos; manual check of the graphical output... // Mesh: shell with random refinement @@ -253,7 +253,7 @@ test() x_rel.reinit(relevant_set, MPI_COMM_WORLD); - ConstraintMatrix cm(relevant_set); + AffineConstraints cm(relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); /* std::vector velocity_mask (dim+1, true); diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc index 148f1c4775..fe4afe5d02 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -69,7 +69,7 @@ test() // build constraint matrix IndexSet locally_relevant(dof.n_dofs()); DoFTools::extract_locally_relevant_dofs(dof, locally_relevant); - ConstraintMatrix constraints(locally_relevant); + AffineConstraints constraints(locally_relevant); DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); diff --git a/tests/mpi/parallel_block_vector_05.cc b/tests/mpi/parallel_block_vector_05.cc index 013eb93ec2..9f11828565 100644 --- a/tests/mpi/parallel_block_vector_05.cc +++ b/tests/mpi/parallel_block_vector_05.cc @@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_06.cc b/tests/mpi/parallel_block_vector_06.cc index cedd38f0b3..7ab286e997 100644 --- a/tests/mpi/parallel_block_vector_06.cc +++ b/tests/mpi/parallel_block_vector_06.cc @@ -93,7 +93,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_07.cc b/tests/mpi/parallel_block_vector_07.cc index 937964710c..82d87269ed 100644 --- a/tests/mpi/parallel_block_vector_07.cc +++ b/tests/mpi/parallel_block_vector_07.cc @@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_08.cc b/tests/mpi/parallel_block_vector_08.cc index bc9ef338a9..fced3da188 100644 --- a/tests/mpi/parallel_block_vector_08.cc +++ b/tests/mpi/parallel_block_vector_08.cc @@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_09.cc b/tests/mpi/parallel_block_vector_09.cc index 6b817fcf14..4a2150142c 100644 --- a/tests/mpi/parallel_block_vector_09.cc +++ b/tests/mpi/parallel_block_vector_09.cc @@ -94,7 +94,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_10.cc b/tests/mpi/parallel_block_vector_10.cc index 8109bd28dd..e2a254fd7a 100644 --- a/tests/mpi/parallel_block_vector_10.cc +++ b/tests/mpi/parallel_block_vector_10.cc @@ -90,7 +90,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_11.cc b/tests/mpi/parallel_block_vector_11.cc index ea7de819bf..606e879c65 100644 --- a/tests/mpi/parallel_block_vector_11.cc +++ b/tests/mpi/parallel_block_vector_11.cc @@ -92,7 +92,7 @@ test(const unsigned int n_blocks = 5) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_block_vector_12.cc b/tests/mpi/parallel_block_vector_12.cc index b2d1fed16b..749cc527b2 100644 --- a/tests/mpi/parallel_block_vector_12.cc +++ b/tests/mpi/parallel_block_vector_12.cc @@ -92,7 +92,7 @@ test(const unsigned int n = 5, const unsigned int m = 3) IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - ConstraintMatrix constraints(relevant_set); + AffineConstraints constraints(relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/parallel_vector_back_interpolate.cc b/tests/mpi/parallel_vector_back_interpolate.cc index abbab48427..0c1e690453 100644 --- a/tests/mpi/parallel_vector_back_interpolate.cc +++ b/tests/mpi/parallel_vector_back_interpolate.cc @@ -56,7 +56,7 @@ test() DoFHandler dof1(tria), dof2(tria); dof1.distribute_dofs(fe1); dof2.distribute_dofs(fe2); - ConstraintMatrix c1, c2; + AffineConstraints c1, c2; DoFTools::make_hanging_node_constraints(dof1, c1); c1.close(); DoFTools::make_hanging_node_constraints(dof2, c2); diff --git a/tests/mpi/periodicity_01.cc b/tests/mpi/periodicity_01.cc index 187a3f52ad..81aa942ad4 100644 --- a/tests/mpi/periodicity_01.cc +++ b/tests/mpi/periodicity_01.cc @@ -105,7 +105,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc index b6270ebb0b..312f5a4235 100644 --- a/tests/mpi/periodicity_02.cc +++ b/tests/mpi/periodicity_02.cc @@ -90,9 +90,9 @@ namespace Step22 FESystem fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - std::vector owned_partitioning; - std::vector relevant_partitioning; + AffineConstraints constraints; + std::vector owned_partitioning; + std::vector relevant_partitioning; TrilinosWrappers::BlockSparsityPattern sparsity_pattern; TrilinosWrappers::BlockSparseMatrix system_matrix; diff --git a/tests/mpi/periodicity_03.cc b/tests/mpi/periodicity_03.cc index 8e5da49f56..7c23d70d34 100644 --- a/tests/mpi/periodicity_03.cc +++ b/tests/mpi/periodicity_03.cc @@ -91,9 +91,9 @@ namespace Step22 FESystem fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - std::vector owned_partitioning; - std::vector relevant_partitioning; + AffineConstraints constraints; + std::vector owned_partitioning; + std::vector relevant_partitioning; TrilinosWrappers::BlockSparseMatrix system_matrix; diff --git a/tests/mpi/periodicity_04.cc b/tests/mpi/periodicity_04.cc index 0fd97a1c9c..10b825e12f 100644 --- a/tests/mpi/periodicity_04.cc +++ b/tests/mpi/periodicity_04.cc @@ -182,7 +182,7 @@ check(const unsigned int orientation, bool reverse) DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; IndexSet locally_owned_dofs = dof_handler.locally_owned_dofs(); IndexSet locally_relevant_dofs; diff --git a/tests/mpi/petsc_distribute_01.cc b/tests/mpi/petsc_distribute_01.cc index cef78ce3e9..5d790792b9 100644 --- a/tests/mpi/petsc_distribute_01.cc +++ b/tests/mpi/petsc_distribute_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a petsc vector +// check AffineConstraints.distribute() for a petsc vector // // we do this by creating a vector where each processor has 100 // elements but no ghost elements. then we add constraints on each @@ -62,7 +62,7 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( diff --git a/tests/mpi/petsc_distribute_01_block.cc b/tests/mpi/petsc_distribute_01_block.cc index 4386a26498..cb6010a4cd 100644 --- a/tests/mpi/petsc_distribute_01_block.cc +++ b/tests/mpi/petsc_distribute_01_block.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a petsc vector +// check AffineConstraints.distribute() for a petsc vector // // like _01, but for a block vector. this has the additional complication that // (at a global level) the set of indices owned by this processor is not @@ -75,7 +75,7 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( diff --git a/tests/mpi/petsc_distribute_01_inhomogenous.cc b/tests/mpi/petsc_distribute_01_inhomogenous.cc index 0e1598b72a..ae8349d2ea 100644 --- a/tests/mpi/petsc_distribute_01_inhomogenous.cc +++ b/tests/mpi/petsc_distribute_01_inhomogenous.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a petsc vector +// check AffineConstraints.distribute() for a petsc vector // // like _01, but with an inhomogeneity @@ -54,7 +54,7 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( diff --git a/tests/mpi/petsc_locally_owned_elements.cc b/tests/mpi/petsc_locally_owned_elements.cc index b8b9701a51..26a3f78dd0 100644 --- a/tests/mpi/petsc_locally_owned_elements.cc +++ b/tests/mpi/petsc_locally_owned_elements.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a petsc vector +// check AffineConstraints.distribute() for a petsc vector // // like _01, but for a block vector. this has the additional complication that // (at a global level) the set of indices owned by this processor is not diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc index a2b8b20762..031569f6a9 100644 --- a/tests/mpi/renumber_z_order_01.cc +++ b/tests/mpi/renumber_z_order_01.cc @@ -83,7 +83,7 @@ test() TrilinosWrappers::MPI::Vector vector; vector.reinit(dofh.locally_owned_dofs(), MPI_COMM_WORLD); { - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); QGauss quadrature_formula(2); FEValues fe_values(fe, diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc index a544241b14..286a9f6ea4 100644 --- a/tests/mpi/renumber_z_order_02.cc +++ b/tests/mpi/renumber_z_order_02.cc @@ -84,7 +84,7 @@ test() TrilinosWrappers::MPI::Vector vector; vector.reinit(dofh.locally_owned_dofs(), MPI_COMM_WORLD); { - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); QGauss quadrature_formula(2); FEValues fe_values(fe, diff --git a/tests/mpi/step-37.cc b/tests/mpi/step-37.cc index b441917429..fbbc626106 100644 --- a/tests/mpi/step-37.cc +++ b/tests/mpi/step-37.cc @@ -104,13 +104,13 @@ namespace Step37 std::shared_ptr< MappingFEField>> mapping; - ConstraintMatrix constraints_euler; + AffineConstraints constraints_euler; LinearAlgebra::distributed::Vector euler_positions; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; - ConstraintMatrix non_homogeneous_constraints; + AffineConstraints constraints; + AffineConstraints non_homogeneous_constraints; typedef MatrixFreeOperators::LaplaceOperator< dim, degree_finite_element, @@ -258,7 +258,7 @@ namespace Step37 DoFTools::extract_locally_relevant_level_dofs(dof_handler, level, relevant_dofs); - ConstraintMatrix level_constraints; + AffineConstraints level_constraints; level_constraints.reinit(relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); @@ -321,7 +321,7 @@ namespace Step37 non_homogeneous_constraints.clear(); { - ConstraintMatrix hanging_nodes_laplace_constraints; + AffineConstraints hanging_nodes_laplace_constraints; hanging_nodes_laplace_constraints.reinit(locally_relevant_dofs); non_homogeneous_constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints( @@ -340,7 +340,7 @@ namespace Step37 // make sure hanging nodes override Dirichlet non_homogeneous_constraints.merge( hanging_nodes_laplace_constraints, - ConstraintMatrix::MergeConflictBehavior::right_object_wins); + AffineConstraints::MergeConflictBehavior::right_object_wins); non_homogeneous_constraints.close(); } diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc index a2424b3fb7..e4486a4258 100644 --- a/tests/mpi/step-40.cc +++ b/tests/mpi/step-40.cc @@ -91,7 +91,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/step-40_cuthill_mckee.cc b/tests/mpi/step-40_cuthill_mckee.cc index f13724b975..763c8501e8 100644 --- a/tests/mpi/step-40_cuthill_mckee.cc +++ b/tests/mpi/step-40_cuthill_mckee.cc @@ -96,7 +96,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc b/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc index bf6449ad0e..3f7be85e07 100644 --- a/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc +++ b/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc @@ -97,7 +97,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc index e3ce2b2b0d..f2f4109027 100644 --- a/tests/mpi/step-40_direct_solver.cc +++ b/tests/mpi/step-40_direct_solver.cc @@ -91,7 +91,7 @@ namespace Step40 IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; PETScWrappers::MPI::SparseMatrix system_matrix; PETScWrappers::MPI::Vector locally_relevant_solution; diff --git a/tests/mpi/trilinos_distribute_01.cc b/tests/mpi/trilinos_distribute_01.cc index e7a3258183..4cc60f98aa 100644 --- a/tests/mpi/trilinos_distribute_01.cc +++ b/tests/mpi/trilinos_distribute_01.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a trilinos vector +// check AffineConstraints.distribute() for a trilinos vector // // we do this by creating a vector where each processor has 100 // elements but no ghost elements. then we add constraints on each @@ -67,14 +67,14 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - ConstraintMatrix cm(locally_relevant_range); + AffineConstraints cm(locally_relevant_range); // add constraints that constrain an element in the middle of the // local range of each processor against an element outside, both in diff --git a/tests/mpi/trilinos_distribute_01_block.cc b/tests/mpi/trilinos_distribute_01_block.cc index c1daf2fb37..1c4ec4f195 100644 --- a/tests/mpi/trilinos_distribute_01_block.cc +++ b/tests/mpi/trilinos_distribute_01_block.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a trilinos vector +// check AffineConstraints.distribute() for a trilinos vector // // like _01, but for a block vector. this has the additional complication that // (at a global level) the set of indices owned by this processor is not @@ -76,7 +76,7 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( @@ -88,7 +88,7 @@ test() vec.block(0).size() + std::min(static_cast(100 * myid + 150), vec.block(0).size())); - ConstraintMatrix cm(locally_relevant_range); + AffineConstraints cm(locally_relevant_range); // add constraints that constrain an element in the middle of the // local range of each processor against an element outside, both in diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous.cc b/tests/mpi/trilinos_distribute_01_inhomogenous.cc index ff2c0ca45e..b0f3d562ca 100644 --- a/tests/mpi/trilinos_distribute_01_inhomogenous.cc +++ b/tests/mpi/trilinos_distribute_01_inhomogenous.cc @@ -15,7 +15,7 @@ -// check ConstraintMatrix.distribute() for a trilinos vector +// check AffineConstraints.distribute() for a trilinos vector // // like _01, but with an inhomogeneity @@ -59,14 +59,14 @@ test() } - // create a ConstraintMatrix with a range that exceeds the locally + // create a AffineConstraints with a range that exceeds the locally // owned range by 50 on each side IndexSet locally_relevant_range(vec.size()); locally_relevant_range.add_range( std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - ConstraintMatrix cm(locally_relevant_range); + AffineConstraints cm(locally_relevant_range); // add constraints that constrain an element in the middle of the // local range of each processor against an element outside, both in diff --git a/tests/mpi/trilinos_distribute_03.cc b/tests/mpi/trilinos_distribute_03.cc index afad2caa26..4c557e09f1 100644 --- a/tests/mpi/trilinos_distribute_03.cc +++ b/tests/mpi/trilinos_distribute_03.cc @@ -15,7 +15,7 @@ -// document bug in the new ConstraintMatrix::distribute() from r29593 +// document bug in the new AffineConstraints::distribute() from r29593 // if one vector owns all DoFs, then distribute() hangs. #include @@ -47,7 +47,7 @@ test() vec(i) = i; vec.compress(VectorOperation::insert); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); cm.distribute(vec); diff --git a/tests/mpi/trilinos_distribute_04.cc b/tests/mpi/trilinos_distribute_04.cc index afe3458606..2bdd80f76d 100644 --- a/tests/mpi/trilinos_distribute_04.cc +++ b/tests/mpi/trilinos_distribute_04.cc @@ -15,22 +15,21 @@ -// document bug in the new ConstraintMatrix::distribute(): +// document bug in the new AffineConstraints::distribute(): /* -------------------------------------------------------- An error occurred in line <1028> of file -in function void dealii::ConstraintMatrix::distribute(VectorType&) const [with -VectorType = dealii::TrilinosWrappers::MPI::Vector] The violated condition was: - vec(it->line) == it->entries.size() -The name and call sequence of the exception was: - ExcIncorrectConstraint(it->line, it->entries.size()) +in function void dealii::AffineConstraints::distribute(VectorType&) +const [with VectorType = dealii::TrilinosWrappers::MPI::Vector] The violated +condition was: vec(it->line) == it->entries.size() The name and call sequence of +the exception was: ExcIncorrectConstraint(it->line, it->entries.size()) Additional Information: While distributing the constraint for DoF 41, it turns out that one of the processors who own the 2 degrees of freedom that x_41 is constrained against does not know about the constraint on x_41. Did you not initialize the -ConstraintMatrix with the appropriate locally_relevant set so that every -processor who owns a DoF that constrains another DoF also knows about this +AffineConstraints with the appropriate locally_relevant set so that +every processor who owns a DoF that constrains another DoF also knows about this constraint? -------------------------------------------------------- @@ -94,7 +93,7 @@ test() IndexSet locally_relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, locally_relevant_set); - ConstraintMatrix cm; + AffineConstraints cm; cm.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); diff --git a/tests/multigrid/events_01.cc b/tests/multigrid/events_01.cc index bed5868575..4cfa2d97c5 100644 --- a/tests/multigrid/events_01.cc +++ b/tests/multigrid/events_01.cc @@ -113,7 +113,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -276,9 +276,9 @@ namespace Step50 std::vector local_dof_indices(dofs_per_cell); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/interface_matrix_entry_01.cc b/tests/multigrid/interface_matrix_entry_01.cc index 80a8370fda..de940fa665 100644 --- a/tests/multigrid/interface_matrix_entry_01.cc +++ b/tests/multigrid/interface_matrix_entry_01.cc @@ -81,11 +81,11 @@ test() } tria.execute_coarsening_and_refinement(); - FE_Q fe(2); - DoFHandler mg_dof_handler(tria); - IndexSet locally_relevant_set; - ConstraintMatrix constraints; - MGConstrainedDoFs mg_constrained_dofs; + FE_Q fe(2); + DoFHandler mg_dof_handler(tria); + IndexSet locally_relevant_set; + AffineConstraints constraints; + MGConstrainedDoFs mg_constrained_dofs; mg_dof_handler.distribute_dofs(fe); mg_dof_handler.distribute_mg_dofs(); diff --git a/tests/multigrid/mg_coarse_01.cc b/tests/multigrid/mg_coarse_01.cc index 35b32d8309..fb0ec42257 100644 --- a/tests/multigrid/mg_coarse_01.cc +++ b/tests/multigrid/mg_coarse_01.cc @@ -113,7 +113,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -343,9 +343,9 @@ namespace Step50 const Coefficient coefficient(K); std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/step-16-02.cc b/tests/multigrid/step-16-02.cc index a4f6b0cb02..46fe69d95c 100644 --- a/tests/multigrid/step-16-02.cc +++ b/tests/multigrid/step-16-02.cc @@ -157,7 +157,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -406,9 +406,9 @@ LaplaceProblem::assemble_multigrid(const bool &use_mw) const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_levels()); - std::vector boundary_interface_constraints( + std::vector> boundary_interface_constraints( triangulation.n_levels()); for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16-03.cc b/tests/multigrid/step-16-03.cc index 4c21457ad6..b0fadd8968 100644 --- a/tests/multigrid/step-16-03.cc +++ b/tests/multigrid/step-16-03.cc @@ -83,7 +83,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -287,8 +287,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = min_level; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16-04.cc b/tests/multigrid/step-16-04.cc index 63ed99b98d..39ddbad30c 100644 --- a/tests/multigrid/step-16-04.cc +++ b/tests/multigrid/step-16-04.cc @@ -85,7 +85,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; LinearAlgebra::distributed::Vector solution; LinearAlgebra::distributed::Vector system_rhs; @@ -296,8 +296,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = min_level; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16-05.cc b/tests/multigrid/step-16-05.cc index af527d98d4..dd7057ae91 100644 --- a/tests/multigrid/step-16-05.cc +++ b/tests/multigrid/step-16-05.cc @@ -81,8 +81,8 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix hanging_node_constraints; - ConstraintMatrix constraints; + AffineConstraints hanging_node_constraints; + AffineConstraints constraints; LinearAlgebra::distributed::Vector solution; LinearAlgebra::distributed::Vector system_rhs; @@ -297,8 +297,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = min_level; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16-06.cc b/tests/multigrid/step-16-06.cc index e36142e4f4..aa46cd7dba 100644 --- a/tests/multigrid/step-16-06.cc +++ b/tests/multigrid/step-16-06.cc @@ -81,8 +81,8 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix hanging_node_constraints; - ConstraintMatrix constraints; + AffineConstraints hanging_node_constraints; + AffineConstraints constraints; LinearAlgebra::distributed::Vector solution; LinearAlgebra::distributed::Vector system_rhs; @@ -297,8 +297,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = min_level; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16-07.cc b/tests/multigrid/step-16-07.cc index 8935f12bcf..f6b1aadb5a 100644 --- a/tests/multigrid/step-16-07.cc +++ b/tests/multigrid/step-16-07.cc @@ -85,7 +85,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -293,8 +293,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { boundary_constraints[level].add_lines( diff --git a/tests/multigrid/step-16-50-mpi-linear-operator.cc b/tests/multigrid/step-16-50-mpi-linear-operator.cc index a00a595465..e235d990f5 100644 --- a/tests/multigrid/step-16-50-mpi-linear-operator.cc +++ b/tests/multigrid/step-16-50-mpi-linear-operator.cc @@ -114,7 +114,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -344,9 +344,9 @@ namespace Step50 - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/step-16-50-mpi-smoother.cc b/tests/multigrid/step-16-50-mpi-smoother.cc index 8a18dd1f9b..680801bb64 100644 --- a/tests/multigrid/step-16-50-mpi-smoother.cc +++ b/tests/multigrid/step-16-50-mpi-smoother.cc @@ -114,7 +114,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -344,9 +344,9 @@ namespace Step50 - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/step-16-50-mpi.cc b/tests/multigrid/step-16-50-mpi.cc index 4500ad5737..7529a61349 100644 --- a/tests/multigrid/step-16-50-mpi.cc +++ b/tests/multigrid/step-16-50-mpi.cc @@ -114,7 +114,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -344,9 +344,9 @@ namespace Step50 - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/step-16-50-serial.cc b/tests/multigrid/step-16-50-serial.cc index c42258a1d3..736b86d15a 100644 --- a/tests/multigrid/step-16-50-serial.cc +++ b/tests/multigrid/step-16-50-serial.cc @@ -88,7 +88,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -291,8 +291,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { boundary_constraints[level].add_lines( diff --git a/tests/multigrid/step-16-bdry1.cc b/tests/multigrid/step-16-bdry1.cc index 8434de54e1..a7f567beb1 100644 --- a/tests/multigrid/step-16-bdry1.cc +++ b/tests/multigrid/step-16-bdry1.cc @@ -158,7 +158,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -412,9 +412,9 @@ LaplaceProblem::assemble_multigrid(bool use_mw) const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { diff --git a/tests/multigrid/step-16.cc b/tests/multigrid/step-16.cc index 820e5f2901..3b4dfe4cd3 100644 --- a/tests/multigrid/step-16.cc +++ b/tests/multigrid/step-16.cc @@ -85,7 +85,7 @@ private: SparsityPattern sparsity_pattern; SparseMatrix system_matrix; - ConstraintMatrix constraints; + AffineConstraints constraints; Vector solution; Vector system_rhs; @@ -293,8 +293,9 @@ LaplaceProblem::assemble_multigrid() const Coefficient coefficient; std::vector coefficient_values(n_q_points); - std::vector boundary_constraints(triangulation.n_levels()); - ConstraintMatrix empty_constraints; + std::vector> boundary_constraints( + triangulation.n_levels()); + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_levels(); ++level) { boundary_constraints[level].add_lines( diff --git a/tests/multigrid/step-50_01.cc b/tests/multigrid/step-50_01.cc index 8081d98e23..6d0144f780 100644 --- a/tests/multigrid/step-50_01.cc +++ b/tests/multigrid/step-50_01.cc @@ -110,7 +110,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -340,9 +340,9 @@ namespace Step50 const Coefficient coefficient(K); std::vector coefficient_values(n_q_points); - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/step-50_02.cc b/tests/multigrid/step-50_02.cc index 3b64ba792b..58e1c3b951 100644 --- a/tests/multigrid/step-50_02.cc +++ b/tests/multigrid/step-50_02.cc @@ -114,7 +114,7 @@ namespace Step50 IndexSet locally_relevant_set; - ConstraintMatrix constraints; + AffineConstraints constraints; vector_t solution; vector_t system_rhs; @@ -353,9 +353,9 @@ namespace Step50 - std::vector boundary_constraints( + std::vector> boundary_constraints( triangulation.n_global_levels()); - ConstraintMatrix empty_constraints; + AffineConstraints empty_constraints; for (unsigned int level = 0; level < triangulation.n_global_levels(); ++level) { diff --git a/tests/multigrid/transfer_04.cc b/tests/multigrid/transfer_04.cc index 764e7382c6..a2ffd2d42f 100644 --- a/tests/multigrid/transfer_04.cc +++ b/tests/multigrid/transfer_04.cc @@ -128,8 +128,8 @@ check_fe(FiniteElement &fe) MGConstrainedDoFs mg_constrained_dofs; mg_constrained_dofs.initialize(dofh); - ConstraintMatrix hanging_node_constraints; - IndexSet locally_relevant_set; + AffineConstraints hanging_node_constraints; + IndexSet locally_relevant_set; DoFTools::extract_locally_relevant_dofs(dofh, locally_relevant_set); hanging_node_constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(dofh, hanging_node_constraints); diff --git a/tests/non_matching/coupling_02.cc b/tests/non_matching/coupling_02.cc index 0f660bdc44..d2fcec5e04 100644 --- a/tests/non_matching/coupling_02.cc +++ b/tests/non_matching/coupling_02.cc @@ -75,7 +75,7 @@ test() QGauss quad(3); // Quadrature for coupling - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity; { diff --git a/tests/non_matching/coupling_03.cc b/tests/non_matching/coupling_03.cc index 7cf0c4c58f..43ded37a97 100644 --- a/tests/non_matching/coupling_03.cc +++ b/tests/non_matching/coupling_03.cc @@ -79,7 +79,7 @@ test() QGauss quad(3); // Quadrature for coupling - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity; { diff --git a/tests/non_matching/coupling_04.cc b/tests/non_matching/coupling_04.cc index 8850fa634c..bb0dbd7836 100644 --- a/tests/non_matching/coupling_04.cc +++ b/tests/non_matching/coupling_04.cc @@ -83,7 +83,7 @@ test() } SparseMatrix coupling(sparsity); NonMatching::create_coupling_mass_matrix( - space_dh, dh, quad, coupling, ConstraintMatrix()); + space_dh, dh, quad, coupling, AffineConstraints()); SparsityPattern mass_sparsity; { diff --git a/tests/non_matching/coupling_05.cc b/tests/non_matching/coupling_05.cc index d74584925f..1942d04a66 100644 --- a/tests/non_matching/coupling_05.cc +++ b/tests/non_matching/coupling_05.cc @@ -114,8 +114,8 @@ test() QGauss quad(4); FEValues fev(fe, quad, update_values | update_JxW_values); std::vector dofs(fe.dofs_per_cell); - FullMatrix cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell); - ConstraintMatrix constraints; + FullMatrix cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell); + AffineConstraints constraints; for (auto cell : dh.active_cell_iterators()) if (cell->is_locally_owned()) diff --git a/tests/non_matching/coupling_06.cc b/tests/non_matching/coupling_06.cc index 3074f846d4..fc2397a47c 100644 --- a/tests/non_matching/coupling_06.cc +++ b/tests/non_matching/coupling_06.cc @@ -117,8 +117,8 @@ test() QGauss quad(4); FEValues fev(fe, quad, update_values | update_JxW_values); std::vector dofs(fe.dofs_per_cell); - FullMatrix cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell); - ConstraintMatrix constraints; + FullMatrix cell_matrix(fe.dofs_per_cell, fe.dofs_per_cell); + AffineConstraints constraints; for (auto cell : dh.active_cell_iterators()) if (cell->is_locally_owned()) diff --git a/tests/non_matching/coupling_07.cc b/tests/non_matching/coupling_07.cc index d0d01ab74e..13bd685dab 100644 --- a/tests/non_matching/coupling_07.cc +++ b/tests/non_matching/coupling_07.cc @@ -69,7 +69,7 @@ test() dh.distribute_dofs(fe); space_dh.distribute_dofs(space_fe); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(space_dh, constraints); constraints.close(); diff --git a/tests/numerics/assemble_matrix_parallel_01.cc b/tests/numerics/assemble_matrix_parallel_01.cc index 07bb6bb9fb..5cc8557e5e 100644 --- a/tests/numerics/assemble_matrix_parallel_01.cc +++ b/tests/numerics/assemble_matrix_parallel_01.cc @@ -16,8 +16,8 @@ // this function tests that assembly of matrices in parallel works properly, -// in particular the cache used in ConstraintMatrix that stores some scratch -// data and is accessed by several threads at the same time. +// in particular the cache used in AffineConstraints that stores some +// scratch data and is accessed by several threads at the same time. #include #include @@ -140,7 +140,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix reference_matrix; diff --git a/tests/numerics/assemble_matrix_parallel_02.cc b/tests/numerics/assemble_matrix_parallel_02.cc index cd8a08e0cc..c0d2a1f730 100644 --- a/tests/numerics/assemble_matrix_parallel_02.cc +++ b/tests/numerics/assemble_matrix_parallel_02.cc @@ -155,7 +155,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix reference_matrix; diff --git a/tests/numerics/assemble_matrix_parallel_03.cc b/tests/numerics/assemble_matrix_parallel_03.cc index 49409b2f60..2668ec70e5 100644 --- a/tests/numerics/assemble_matrix_parallel_03.cc +++ b/tests/numerics/assemble_matrix_parallel_03.cc @@ -140,7 +140,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix reference_matrix; diff --git a/tests/numerics/assemble_matrix_parallel_04.cc b/tests/numerics/assemble_matrix_parallel_04.cc index d5ca959e3f..d222498fa7 100644 --- a/tests/numerics/assemble_matrix_parallel_04.cc +++ b/tests/numerics/assemble_matrix_parallel_04.cc @@ -154,7 +154,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; SparsityPattern sparsity_pattern; SparseMatrix reference_matrix; diff --git a/tests/numerics/create_laplace_matrix_01.cc b/tests/numerics/create_laplace_matrix_01.cc index 0c779f6ad8..a1c3a0b8d7 100644 --- a/tests/numerics/create_laplace_matrix_01.cc +++ b/tests/numerics/create_laplace_matrix_01.cc @@ -89,7 +89,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_01b.cc b/tests/numerics/create_laplace_matrix_01b.cc index eb6d06e8a3..f67bb154b4 100644 --- a/tests/numerics/create_laplace_matrix_01b.cc +++ b/tests/numerics/create_laplace_matrix_01b.cc @@ -90,7 +90,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_02.cc b/tests/numerics/create_laplace_matrix_02.cc index da4c9361ff..6232122df7 100644 --- a/tests/numerics/create_laplace_matrix_02.cc +++ b/tests/numerics/create_laplace_matrix_02.cc @@ -92,7 +92,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_02b.cc b/tests/numerics/create_laplace_matrix_02b.cc index 25d3814ac0..054896aff4 100644 --- a/tests/numerics/create_laplace_matrix_02b.cc +++ b/tests/numerics/create_laplace_matrix_02b.cc @@ -93,7 +93,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_03.cc b/tests/numerics/create_laplace_matrix_03.cc index 6172e7ad0c..eb8a3930ad 100644 --- a/tests/numerics/create_laplace_matrix_03.cc +++ b/tests/numerics/create_laplace_matrix_03.cc @@ -89,7 +89,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_03b.cc b/tests/numerics/create_laplace_matrix_03b.cc index 5a58918abc..57e304e031 100644 --- a/tests/numerics/create_laplace_matrix_03b.cc +++ b/tests/numerics/create_laplace_matrix_03b.cc @@ -90,7 +90,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_04.cc b/tests/numerics/create_laplace_matrix_04.cc index e696bc84f2..3c4c0d906b 100644 --- a/tests/numerics/create_laplace_matrix_04.cc +++ b/tests/numerics/create_laplace_matrix_04.cc @@ -92,7 +92,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_04b.cc b/tests/numerics/create_laplace_matrix_04b.cc index 51a94c892b..abea1c74d0 100644 --- a/tests/numerics/create_laplace_matrix_04b.cc +++ b/tests/numerics/create_laplace_matrix_04b.cc @@ -93,7 +93,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_laplace_matrix_constraints_01.cc b/tests/numerics/create_laplace_matrix_constraints_01.cc index 6c34a68735..df338fbaff 100644 --- a/tests/numerics/create_laplace_matrix_constraints_01.cc +++ b/tests/numerics/create_laplace_matrix_constraints_01.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1, 1.), constraints); diff --git a/tests/numerics/create_laplace_matrix_constraints_02.cc b/tests/numerics/create_laplace_matrix_constraints_02.cc index 4382630876..d777025fbc 100644 --- a/tests/numerics/create_laplace_matrix_constraints_02.cc +++ b/tests/numerics/create_laplace_matrix_constraints_02.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/numerics/create_laplace_matrix_constraints_02b.cc b/tests/numerics/create_laplace_matrix_constraints_02b.cc index 01d23523d0..72e7ce590a 100644 --- a/tests/numerics/create_laplace_matrix_constraints_02b.cc +++ b/tests/numerics/create_laplace_matrix_constraints_02b.cc @@ -76,7 +76,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/numerics/create_laplace_matrix_constraints_03.cc b/tests/numerics/create_laplace_matrix_constraints_03.cc index 4a2a1037b3..0238325ee7 100644 --- a/tests/numerics/create_laplace_matrix_constraints_03.cc +++ b/tests/numerics/create_laplace_matrix_constraints_03.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1, 1.), constraints); diff --git a/tests/numerics/create_laplace_matrix_constraints_04.cc b/tests/numerics/create_laplace_matrix_constraints_04.cc index 8f3d5f6bcf..6099d8ac10 100644 --- a/tests/numerics/create_laplace_matrix_constraints_04.cc +++ b/tests/numerics/create_laplace_matrix_constraints_04.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/numerics/create_mass_matrix_01.cc b/tests/numerics/create_mass_matrix_01.cc index 01591fe64f..519bc47abc 100644 --- a/tests/numerics/create_mass_matrix_01.cc +++ b/tests/numerics/create_mass_matrix_01.cc @@ -89,7 +89,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_01b.cc b/tests/numerics/create_mass_matrix_01b.cc index 8106957d57..ebc328449f 100644 --- a/tests/numerics/create_mass_matrix_01b.cc +++ b/tests/numerics/create_mass_matrix_01b.cc @@ -90,7 +90,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_02.cc b/tests/numerics/create_mass_matrix_02.cc index 906cd88b9a..1d73512381 100644 --- a/tests/numerics/create_mass_matrix_02.cc +++ b/tests/numerics/create_mass_matrix_02.cc @@ -92,7 +92,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_02b.cc b/tests/numerics/create_mass_matrix_02b.cc index 2d7539ea2d..f88273291f 100644 --- a/tests/numerics/create_mass_matrix_02b.cc +++ b/tests/numerics/create_mass_matrix_02b.cc @@ -93,7 +93,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_03.cc b/tests/numerics/create_mass_matrix_03.cc index a535cd8e8e..738aeddd4f 100644 --- a/tests/numerics/create_mass_matrix_03.cc +++ b/tests/numerics/create_mass_matrix_03.cc @@ -89,7 +89,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_03b.cc b/tests/numerics/create_mass_matrix_03b.cc index e424cf024d..b95743d6e6 100644 --- a/tests/numerics/create_mass_matrix_03b.cc +++ b/tests/numerics/create_mass_matrix_03b.cc @@ -90,7 +90,7 @@ check() // not couple, so use pattern SparsityPattern sparsity(dof.n_dofs(), dof.n_dofs()); DoFTools::make_sparsity_pattern(dof, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_04.cc b/tests/numerics/create_mass_matrix_04.cc index 5d5350e36e..ebed5492b1 100644 --- a/tests/numerics/create_mass_matrix_04.cc +++ b/tests/numerics/create_mass_matrix_04.cc @@ -92,7 +92,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_04b.cc b/tests/numerics/create_mass_matrix_04b.cc index e4d4dba591..8801d14b61 100644 --- a/tests/numerics/create_mass_matrix_04b.cc +++ b/tests/numerics/create_mass_matrix_04b.cc @@ -93,7 +93,7 @@ check() mask(0, 0) = mask(1, 1) = DoFTools::always; mask(0, 1) = mask(1, 0) = DoFTools::none; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_05.cc b/tests/numerics/create_mass_matrix_05.cc index 4a977da330..4a79056372 100644 --- a/tests/numerics/create_mass_matrix_05.cc +++ b/tests/numerics/create_mass_matrix_05.cc @@ -92,7 +92,7 @@ check() for (unsigned int j = 0; j < dim; ++j) mask[dim + i][dim + j] = DoFTools::always; DoFTools::make_sparsity_pattern(dof, mask, sparsity); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); constraints.close(); constraints.condense(sparsity); diff --git a/tests/numerics/create_mass_matrix_constraints_01.cc b/tests/numerics/create_mass_matrix_constraints_01.cc index dc1e9506b3..2f489e1ed6 100644 --- a/tests/numerics/create_mass_matrix_constraints_01.cc +++ b/tests/numerics/create_mass_matrix_constraints_01.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1, 1.), constraints); diff --git a/tests/numerics/create_mass_matrix_constraints_02.cc b/tests/numerics/create_mass_matrix_constraints_02.cc index b909270480..81e2508636 100644 --- a/tests/numerics/create_mass_matrix_constraints_02.cc +++ b/tests/numerics/create_mass_matrix_constraints_02.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/numerics/create_mass_matrix_constraints_02b.cc b/tests/numerics/create_mass_matrix_constraints_02b.cc index dd29f58e68..2f11606e0b 100644 --- a/tests/numerics/create_mass_matrix_constraints_02b.cc +++ b/tests/numerics/create_mass_matrix_constraints_02b.cc @@ -76,7 +76,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/numerics/create_mass_matrix_constraints_03.cc b/tests/numerics/create_mass_matrix_constraints_03.cc index c79b2c6af4..d5e0311513 100644 --- a/tests/numerics/create_mass_matrix_constraints_03.cc +++ b/tests/numerics/create_mass_matrix_constraints_03.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1, 1.), constraints); diff --git a/tests/numerics/create_mass_matrix_constraints_04.cc b/tests/numerics/create_mass_matrix_constraints_04.cc index 2f6f272753..ab4f662f4c 100644 --- a/tests/numerics/create_mass_matrix_constraints_04.cc +++ b/tests/numerics/create_mass_matrix_constraints_04.cc @@ -75,7 +75,7 @@ check() MappingQ mapping(3); QGauss quadrature(6); - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values( dof, 0, Functions::ConstantFunction(1., 2), constraints); diff --git a/tests/numerics/error_estimator_02.cc b/tests/numerics/error_estimator_02.cc index e9b668c252..20ebcef9dc 100644 --- a/tests/numerics/error_estimator_02.cc +++ b/tests/numerics/error_estimator_02.cc @@ -263,12 +263,12 @@ test_neumann(const NeumanBC &func) { deallog << "NeumanBC case:" << std::endl; deallog << "--------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p = 3; @@ -348,12 +348,12 @@ test_regular(const MyFunction &func) deallog << std::endl; deallog << "Regular face:" << std::endl; deallog << "-------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p1 = 1; const unsigned int p2 = 2; @@ -462,12 +462,12 @@ test_irregular(const MyFunction &func) deallog << std::endl; deallog << "Irregular face:" << std::endl; deallog << "---------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p1 = 1; const unsigned int p2 = 2; @@ -643,12 +643,12 @@ test(const MySecondFunction &func) deallog << "More complicated mesh:" << std::endl; deallog << "----------------------" << std::endl; - dealii::Triangulation triangulation; - dealii::hp::DoFHandler dof_handler(triangulation); - dealii::hp::FECollection fe_collection; - dealii::hp::QCollection quadrature_formula; - dealii::hp::QCollection face_quadrature_formula; - dealii::ConstraintMatrix constraints; + dealii::Triangulation triangulation; + dealii::hp::DoFHandler dof_handler(triangulation); + dealii::hp::FECollection fe_collection; + dealii::hp::QCollection quadrature_formula; + dealii::hp::QCollection face_quadrature_formula; + dealii::AffineConstraints constraints; for (unsigned int p = 1; p <= 3; p++) { fe_collection.push_back(dealii::FE_Q(QIterated<1>(QTrapez<1>(), p))); diff --git a/tests/numerics/error_estimator_02_complex.cc b/tests/numerics/error_estimator_02_complex.cc index 9d9215ad57..bc5096b7b3 100644 --- a/tests/numerics/error_estimator_02_complex.cc +++ b/tests/numerics/error_estimator_02_complex.cc @@ -208,12 +208,12 @@ test_neumann(const NeumanBC &func) { deallog << "NeumanBC case:" << std::endl; deallog << "--------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p = 3; @@ -293,12 +293,12 @@ test_regular(const MyFunction &func) deallog << std::endl; deallog << "Regular face:" << std::endl; deallog << "-------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p1 = 1; const unsigned int p2 = 2; @@ -407,12 +407,12 @@ test_irregular(const MyFunction &func) deallog << std::endl; deallog << "Irregular face:" << std::endl; deallog << "---------------" << std::endl; - Triangulation triangulation; - hp::DoFHandler dof_handler(triangulation); - hp::FECollection fe_collection; - hp::QCollection quadrature_formula; - hp::QCollection face_quadrature_formula; - ConstraintMatrix constraints; + Triangulation triangulation; + hp::DoFHandler dof_handler(triangulation); + hp::FECollection fe_collection; + hp::QCollection quadrature_formula; + hp::QCollection face_quadrature_formula; + AffineConstraints constraints; const unsigned int p1 = 1; const unsigned int p2 = 2; @@ -590,12 +590,12 @@ test(const MySecondFunction &func) deallog << "More complicated mesh:" << std::endl; deallog << "----------------------" << std::endl; - dealii::Triangulation triangulation; - dealii::hp::DoFHandler dof_handler(triangulation); - dealii::hp::FECollection fe_collection; - dealii::hp::QCollection quadrature_formula; - dealii::hp::QCollection face_quadrature_formula; - dealii::ConstraintMatrix constraints; + dealii::Triangulation triangulation; + dealii::hp::DoFHandler dof_handler(triangulation); + dealii::hp::FECollection fe_collection; + dealii::hp::QCollection quadrature_formula; + dealii::hp::QCollection face_quadrature_formula; + dealii::AffineConstraints constraints; for (unsigned int p = 1; p <= 3; p++) { fe_collection.push_back(dealii::FE_Q(QIterated<1>(QTrapez<1>(), p))); diff --git a/tests/numerics/no_flux_01.cc b/tests/numerics/no_flux_01.cc index 09f4a93e78..4d9b459c0a 100644 --- a/tests/numerics/no_flux_01.cc +++ b/tests/numerics/no_flux_01.cc @@ -54,7 +54,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_02.cc b/tests/numerics/no_flux_02.cc index aa5d6a38ae..db71bc4a6f 100644 --- a/tests/numerics/no_flux_02.cc +++ b/tests/numerics/no_flux_02.cc @@ -55,7 +55,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 1, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_03.cc b/tests/numerics/no_flux_03.cc index e7b9d6345b..a54bdaa238 100644 --- a/tests/numerics/no_flux_03.cc +++ b/tests/numerics/no_flux_03.cc @@ -54,7 +54,7 @@ test(const Triangulation &tr, const FiniteElement &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_04.cc b/tests/numerics/no_flux_04.cc index ccc0ebf26c..b6e220a20a 100644 --- a/tests/numerics/no_flux_04.cc +++ b/tests/numerics/no_flux_04.cc @@ -89,7 +89,7 @@ test(const Triangulation &tr, const FiniteElement &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.close(); diff --git a/tests/numerics/no_flux_05.cc b/tests/numerics/no_flux_05.cc index 619ad1e3b7..610635d31d 100644 --- a/tests/numerics/no_flux_05.cc +++ b/tests/numerics/no_flux_05.cc @@ -65,7 +65,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_06.cc b/tests/numerics/no_flux_06.cc index 2488a42c2c..06cccd7a2f 100644 --- a/tests/numerics/no_flux_06.cc +++ b/tests/numerics/no_flux_06.cc @@ -58,8 +58,8 @@ test_hyper_cube() boundary_ids.insert(1); boundary_ids.insert(3); - ConstraintMatrix cm; - const MappingQ mapping(4); + AffineConstraints cm; + const MappingQ mapping(4); VectorTools::compute_no_normal_flux_constraints( dof, 0, boundary_ids, cm, mapping); cm.close(); diff --git a/tests/numerics/no_flux_07.cc b/tests/numerics/no_flux_07.cc index 00a4c5a421..f20d40cd45 100644 --- a/tests/numerics/no_flux_07.cc +++ b/tests/numerics/no_flux_07.cc @@ -57,7 +57,7 @@ test(const Triangulation &tr, const FiniteElement &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_08.cc b/tests/numerics/no_flux_08.cc index 8d485e5b3e..b025d6e2b3 100644 --- a/tests/numerics/no_flux_08.cc +++ b/tests/numerics/no_flux_08.cc @@ -22,7 +22,7 @@ // in function // static void dealii::VectorTools::compute_no_normal_flux_constraints(const // DoFHandlerType&, unsigned int, const -// std::set&, dealii::ConstraintMatrix&, const +// std::set&, dealii::AffineConstraints&, const // dealii::Mapping&) [with int dim = 3, DoFHandlerType = // dealii::DoFHandler, int spacedim = 3] // The violated condition was: @@ -58,8 +58,8 @@ check() GridGenerator::half_hyper_shell(tr, Point(), 0.5, 1, 0); tr.reset_manifold(0); - ConstraintMatrix cm; - MappingQ mapping(1); + AffineConstraints cm; + MappingQ mapping(1); FESystem fe(FE_Q(1), dim); DoFHandler dofh(tr); diff --git a/tests/numerics/no_flux_09.cc b/tests/numerics/no_flux_09.cc index 429fe46af0..b1f0214939 100644 --- a/tests/numerics/no_flux_09.cc +++ b/tests/numerics/no_flux_09.cc @@ -55,8 +55,8 @@ check() GridGenerator::quarter_hyper_shell(tr, Point(), 0.5, 1.0, 3, true); tr.reset_manifold(0); - ConstraintMatrix cm; - MappingQ mapping(1); + AffineConstraints cm; + MappingQ mapping(1); FESystem fe(FE_Q(1), dim); DoFHandler dofh(tr); diff --git a/tests/numerics/no_flux_10.cc b/tests/numerics/no_flux_10.cc index e2364c0216..75e0c53f6c 100644 --- a/tests/numerics/no_flux_10.cc +++ b/tests/numerics/no_flux_10.cc @@ -19,7 +19,7 @@ // -------------------------------------------------------- // An error occurred in line <304> of file <.../constraint_matrix.cc> in // function -// void dealii::ConstraintMatrix::close() +// void dealii::AffineConstraints::close() // The violated condition was: // dof_index != line->line // The name and call sequence of the exception was: @@ -196,10 +196,10 @@ template void run() { - Triangulation triangulation; - FESystem fe(FE_Q(1), dim); - DoFHandler dof_handler(triangulation); - ConstraintMatrix constraints; + Triangulation triangulation; + FESystem fe(FE_Q(1), dim); + DoFHandler dof_handler(triangulation); + AffineConstraints constraints; sixty_deg_hyper_shell(triangulation, Point(), 0.5, 1.0); GridTools::copy_boundary_to_manifold_id(triangulation); diff --git a/tests/numerics/no_flux_11.cc b/tests/numerics/no_flux_11.cc index 22af454ec4..f6820eb3e7 100644 --- a/tests/numerics/no_flux_11.cc +++ b/tests/numerics/no_flux_11.cc @@ -140,7 +140,7 @@ run() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(6); VectorTools::compute_no_normal_flux_constraints(dof_handler, diff --git a/tests/numerics/no_flux_12.cc b/tests/numerics/no_flux_12.cc index a2ef7a575f..21eb7e4236 100644 --- a/tests/numerics/no_flux_12.cc +++ b/tests/numerics/no_flux_12.cc @@ -25,7 +25,7 @@ in function 5: void dealii::VectorTools::compute_no_normal_flux_constraints(const DoFHandlerType&, unsigned int, const -std::set&, dealii::ConstraintMatrix&, const +std::set&, dealii::AffineConstraints&, const dealii::Mapping&) [with int dim = 3; DoFHandlerType = dealii::DoFHandler; int spacedim = 3] 5: The violated condition was: 5: contribution->second.size() == dim-1 5: The name and call sequence of the @@ -95,7 +95,7 @@ run() DoFHandler dof_handler(tria); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(0); // x=0 no_normal_flux_boundaries.insert(5); // z=1 diff --git a/tests/numerics/no_flux_13.cc b/tests/numerics/no_flux_13.cc index b3fd3f103e..44e07229e7 100644 --- a/tests/numerics/no_flux_13.cc +++ b/tests/numerics/no_flux_13.cc @@ -47,7 +47,7 @@ test() DoFHandler dof_handler(triangulation); dof_handler.distribute_dofs(fe); - ConstraintMatrix constraints; + AffineConstraints constraints; std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(1); deal_II_exceptions::disable_abort_on_exception(); diff --git a/tests/numerics/no_flux_14.cc b/tests/numerics/no_flux_14.cc index 4d949f92a9..471135b760 100644 --- a/tests/numerics/no_flux_14.cc +++ b/tests/numerics/no_flux_14.cc @@ -44,8 +44,8 @@ check() GridGenerator::quarter_hyper_shell(tr, Point(), 0.5, 1.0, 3, true); tr.reset_manifold(0); - ConstraintMatrix cm; - MappingQ mapping(1); + AffineConstraints cm; + MappingQ mapping(1); FESystem fe(FE_Q(3), dim); DoFHandler dofh(tr); diff --git a/tests/numerics/no_flux_15.cc b/tests/numerics/no_flux_15.cc index e62069b62a..cc4395304b 100644 --- a/tests/numerics/no_flux_15.cc +++ b/tests/numerics/no_flux_15.cc @@ -47,8 +47,8 @@ check() tria.set_all_manifold_ids(0); tria.set_manifold(0, spherical); - ConstraintMatrix cm; - MappingQ mapping(4); + AffineConstraints cm; + MappingQ mapping(4); FESystem fe(FE_Q(2), dim); DoFHandler dofh(tria); diff --git a/tests/numerics/no_flux_hp_01.cc b/tests/numerics/no_flux_hp_01.cc index 9f6226c47c..968a5ef3da 100644 --- a/tests/numerics/no_flux_hp_01.cc +++ b/tests/numerics/no_flux_hp_01.cc @@ -50,7 +50,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_hp_02.cc b/tests/numerics/no_flux_hp_02.cc index 677f505433..9629c9c665 100644 --- a/tests/numerics/no_flux_hp_02.cc +++ b/tests/numerics/no_flux_hp_02.cc @@ -51,7 +51,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 1, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_hp_03.cc b/tests/numerics/no_flux_hp_03.cc index 83a025c306..55ff250f14 100644 --- a/tests/numerics/no_flux_hp_03.cc +++ b/tests/numerics/no_flux_hp_03.cc @@ -48,7 +48,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/no_flux_hp_04.cc b/tests/numerics/no_flux_hp_04.cc index 0929da6427..af05e24c0c 100644 --- a/tests/numerics/no_flux_hp_04.cc +++ b/tests/numerics/no_flux_hp_04.cc @@ -82,7 +82,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.close(); diff --git a/tests/numerics/no_flux_hp_05.cc b/tests/numerics/no_flux_hp_05.cc index c850258994..50228d3a8d 100644 --- a/tests/numerics/no_flux_hp_05.cc +++ b/tests/numerics/no_flux_hp_05.cc @@ -57,7 +57,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_no_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/normal_flux_01.cc b/tests/numerics/normal_flux_01.cc index a53c95ed1f..7de6e3bb08 100644 --- a/tests/numerics/normal_flux_01.cc +++ b/tests/numerics/normal_flux_01.cc @@ -54,7 +54,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/normal_flux_02.cc b/tests/numerics/normal_flux_02.cc index 79bebd1a16..c3052ebfb6 100644 --- a/tests/numerics/normal_flux_02.cc +++ b/tests/numerics/normal_flux_02.cc @@ -55,7 +55,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_normal_flux_constraints(dof, 1, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/normal_flux_03.cc b/tests/numerics/normal_flux_03.cc index a6a2f4d676..63052c6f0b 100644 --- a/tests/numerics/normal_flux_03.cc +++ b/tests/numerics/normal_flux_03.cc @@ -49,7 +49,7 @@ test(const Triangulation &tr, const FiniteElement &fe) std::set boundary_ids; boundary_ids.insert(0); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/normal_flux_hp_01.cc b/tests/numerics/normal_flux_hp_01.cc index 34bc0e9ea2..1b1b8e2efa 100644 --- a/tests/numerics/normal_flux_hp_01.cc +++ b/tests/numerics/normal_flux_hp_01.cc @@ -55,7 +55,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_normal_flux_constraints(dof, 0, boundary_ids, cm); cm.print(deallog.get_file_stream()); diff --git a/tests/numerics/normal_flux_inhom_01.cc b/tests/numerics/normal_flux_inhom_01.cc index 6570c2066d..c212a55206 100644 --- a/tests/numerics/normal_flux_inhom_01.cc +++ b/tests/numerics/normal_flux_inhom_01.cc @@ -60,7 +60,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_nonzero_normal_flux_constraints( dof, 0, boundary_ids, function_map, cm); diff --git a/tests/numerics/project_01.cc b/tests/numerics/project_01.cc index dbf2292f06..ec3510d761 100644 --- a/tests/numerics/project_01.cc +++ b/tests/numerics/project_01.cc @@ -75,7 +75,7 @@ test() Vector v(dh.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dh, cm, QGauss(3), F(), v); diff --git a/tests/numerics/project_01_curved_boundary.cc b/tests/numerics/project_01_curved_boundary.cc index ab3204a407..6707a71642 100644 --- a/tests/numerics/project_01_curved_boundary.cc +++ b/tests/numerics/project_01_curved_boundary.cc @@ -87,7 +87,7 @@ test() Vector v(dh.n_dofs()); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); // use the implicit Q1 mapping. this will yield a zero solution diff --git a/tests/numerics/project_02.cc b/tests/numerics/project_02.cc index 50498db5bf..8441db9af8 100644 --- a/tests/numerics/project_02.cc +++ b/tests/numerics/project_02.cc @@ -78,7 +78,7 @@ test() v.block(1).reinit(dh.n_dofs() - dh.n_dofs() / 2); v.collect_sizes(); - ConstraintMatrix cm; + AffineConstraints cm; cm.close(); VectorTools::project(dh, cm, QGauss(3), F(), v); diff --git a/tests/numerics/project_03.cc b/tests/numerics/project_03.cc index bceaac3061..3645729394 100644 --- a/tests/numerics/project_03.cc +++ b/tests/numerics/project_03.cc @@ -80,7 +80,7 @@ test() const F approximated_function; - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::interpolate_boundary_values(dh, 0, approximated_function, cm); cm.close(); diff --git a/tests/numerics/project_bv_curl_conf.cc b/tests/numerics/project_bv_curl_conf.cc index 7060af49fb..8821a532ab 100644 --- a/tests/numerics/project_bv_curl_conf.cc +++ b/tests/numerics/project_bv_curl_conf.cc @@ -65,8 +65,8 @@ test_boundary_values(const FiniteElement &fe) dof_handler.distribute_dofs(fe); - BoundaryFunction boundary_function; - ConstraintMatrix constraints; + BoundaryFunction boundary_function; + AffineConstraints constraints; constraints.clear(); VectorTools::project_boundary_values_curl_conforming( diff --git a/tests/numerics/project_bv_curl_conf_02.cc b/tests/numerics/project_bv_curl_conf_02.cc index 456d3ce09f..846e088fee 100644 --- a/tests/numerics/project_bv_curl_conf_02.cc +++ b/tests/numerics/project_bv_curl_conf_02.cc @@ -61,8 +61,8 @@ BoundaryFunction::vector_value(const Point &, template void -test_boundary_values(const FiniteElement &fe, - ConstraintMatrix & constraints) +test_boundary_values(const FiniteElement & fe, + AffineConstraints &constraints) { Triangulation triangulation; GridGenerator::subdivided_hyper_cube(triangulation, 2); @@ -81,7 +81,7 @@ test(unsigned order) { deallog << "dim:" << dim << " order:" << order << "\t"; - ConstraintMatrix constraints_fe, constraints_fes; + AffineConstraints constraints_fe, constraints_fes; { FE_Nedelec<3> fe(order); diff --git a/tests/numerics/project_bv_div_conf.cc b/tests/numerics/project_bv_div_conf.cc index 9615745fb8..2414ddd178 100644 --- a/tests/numerics/project_bv_div_conf.cc +++ b/tests/numerics/project_bv_div_conf.cc @@ -65,8 +65,8 @@ test_boundary_values(const FiniteElement &fe) dof_handler.distribute_dofs(fe); - BoundaryFunction boundary_function; - ConstraintMatrix constraints; + BoundaryFunction boundary_function; + AffineConstraints constraints; constraints.clear(); VectorTools::project_boundary_values_div_conforming( diff --git a/tests/numerics/project_common.h b/tests/numerics/project_common.h index 44b47c25c4..2d8fc0cbc2 100644 --- a/tests/numerics/project_common.h +++ b/tests/numerics/project_common.h @@ -109,7 +109,7 @@ do_project(const Triangulation &triangulation, deallog << "n_dofs=" << dof_handler.n_dofs() << std::endl; - ConstraintMatrix constraints; + AffineConstraints constraints; DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/numerics/project_parallel_common.h b/tests/numerics/project_parallel_common.h index ffaadd5ac8..c6757ea88a 100644 --- a/tests/numerics/project_parallel_common.h +++ b/tests/numerics/project_parallel_common.h @@ -117,7 +117,7 @@ do_project(const parallel::distributed::Triangulation &triangulation, IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/numerics/project_parallel_qp_common.h b/tests/numerics/project_parallel_qp_common.h index 6a98dba68f..580a18d547 100644 --- a/tests/numerics/project_parallel_qp_common.h +++ b/tests/numerics/project_parallel_qp_common.h @@ -114,7 +114,7 @@ do_project(const parallel::distributed::Triangulation &triangulation, IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/numerics/project_parallel_qpmf_common.h b/tests/numerics/project_parallel_qpmf_common.h index 676b11a7b8..357a4926a2 100644 --- a/tests/numerics/project_parallel_qpmf_common.h +++ b/tests/numerics/project_parallel_qpmf_common.h @@ -113,11 +113,11 @@ do_project(const parallel::distributed::Triangulation &triangulation, deallog << "n_cells=" << triangulation.n_global_active_cells() << std::endl; std::vector>> dof_handlers(fes.size()); - std::vector locally_relevant_dofs(fes.size()); - std::vector constraints(fes.size()); + std::vector locally_relevant_dofs(fes.size()); + std::vector> constraints(fes.size()); - std::vector *> dof_handlers_mf(fes.size()); - std::vector constraints_mf(fes.size()); + std::vector *> dof_handlers_mf(fes.size()); + std::vector *> constraints_mf(fes.size()); for (unsigned int i = 0; i < fes.size(); ++i) { dof_handlers[i] = std::make_shared>(triangulation); diff --git a/tests/numerics/tangential_flux_inhom_01.cc b/tests/numerics/tangential_flux_inhom_01.cc index 8897f713d0..ac93fe48b4 100644 --- a/tests/numerics/tangential_flux_inhom_01.cc +++ b/tests/numerics/tangential_flux_inhom_01.cc @@ -61,7 +61,7 @@ test(const Triangulation &tr, const FiniteElement &fe) for (unsigned int j = 0; j <= i; ++j) boundary_ids.insert(j); - ConstraintMatrix cm; + AffineConstraints cm; VectorTools::compute_nonzero_tangential_flux_constraints( dof, 0, boundary_ids, function_map, cm); diff --git a/tests/petsc_complex/assemble_01.cc b/tests/petsc_complex/assemble_01.cc index 683f6589b6..ed017c0141 100644 --- a/tests/petsc_complex/assemble_01.cc +++ b/tests/petsc_complex/assemble_01.cc @@ -15,8 +15,8 @@ // Check that all the functionality needed for calling -// ConstraintMatrix::distribute_local_to_global on mutiple combinations of -// PETScWrappers objects is correctly instantiated and works. +// AffineConstraints::distribute_local_to_global on mutiple combinations +// of PETScWrappers objects is correctly instantiated and works. #include #include diff --git a/tests/petsc_complex/fe_get_function_values.cc b/tests/petsc_complex/fe_get_function_values.cc index a38af57246..a85328170a 100644 --- a/tests/petsc_complex/fe_get_function_values.cc +++ b/tests/petsc_complex/fe_get_function_values.cc @@ -105,7 +105,7 @@ test() const types::global_dof_index n_local_dofs = locally_owned_dofs.n_elements(); - ConstraintMatrix constraints; + AffineConstraints constraints; constraints.reinit(locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc index fcc1cff3bf..e4d458b0f9 100644 --- a/tests/physics/step-18-rotation_matrix.cc +++ b/tests/physics/step-18-rotation_matrix.cc @@ -176,7 +176,7 @@ namespace Step18 parallel::shared::Triangulation triangulation; FESystem fe; DoFHandler dof_handler; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; const QGauss quadrature_formula; std::vector> quadrature_point_history; PETScWrappers::MPI::SparseMatrix system_matrix; diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc index 32f2c99900..91fa6fd443 100644 --- a/tests/physics/step-18.cc +++ b/tests/physics/step-18.cc @@ -192,7 +192,7 @@ namespace Step18 parallel::shared::Triangulation triangulation; FESystem fe; DoFHandler dof_handler; - ConstraintMatrix hanging_node_constraints; + AffineConstraints hanging_node_constraints; const QGauss quadrature_formula; std::vector> quadrature_point_history; PETScWrappers::MPI::SparseMatrix system_matrix; diff --git a/tests/physics/step-44-standard_tensors-material_push_forward.cc b/tests/physics/step-44-standard_tensors-material_push_forward.cc index 7c223b73fe..d85406177f 100644 --- a/tests/physics/step-44-standard_tensors-material_push_forward.cc +++ b/tests/physics/step-44-standard_tensors-material_push_forward.cc @@ -904,7 +904,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; @@ -998,7 +998,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/physics/step-44-standard_tensors-spatial.cc b/tests/physics/step-44-standard_tensors-spatial.cc index 237a0f5e15..b5dd3777b4 100644 --- a/tests/physics/step-44-standard_tensors-spatial.cc +++ b/tests/physics/step-44-standard_tensors-spatial.cc @@ -704,7 +704,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; @@ -798,7 +798,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/physics/step-44.cc b/tests/physics/step-44.cc index 813ac98329..4be51ee71d 100644 --- a/tests/physics/step-44.cc +++ b/tests/physics/step-44.cc @@ -717,7 +717,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; @@ -811,7 +811,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/quick_tests/step-petsc.cc b/tests/quick_tests/step-petsc.cc index 3394e2d969..b620e8b967 100644 --- a/tests/quick_tests/step-petsc.cc +++ b/tests/quick_tests/step-petsc.cc @@ -68,7 +68,7 @@ private: PETScWrappers::SparseMatrix A; PETScWrappers::MPI::Vector b, x; - ConstraintMatrix constraints; + AffineConstraints constraints; TableHandler output_table; }; diff --git a/tests/quick_tests/step-slepc.cc b/tests/quick_tests/step-slepc.cc index 88ebf33a4a..7150d84e5f 100644 --- a/tests/quick_tests/step-slepc.cc +++ b/tests/quick_tests/step-slepc.cc @@ -68,7 +68,7 @@ private: PETScWrappers::SparseMatrix A, B; std::vector x; std::vector lambda; - ConstraintMatrix constraints; + AffineConstraints constraints; TableHandler output_table; }; diff --git a/tests/quick_tests/step-trilinos.cc b/tests/quick_tests/step-trilinos.cc index 812485f6c0..35937678ab 100644 --- a/tests/quick_tests/step-trilinos.cc +++ b/tests/quick_tests/step-trilinos.cc @@ -69,7 +69,7 @@ private: TrilinosWrappers::SparseMatrix A; TrilinosWrappers::MPI::Vector b, x; - ConstraintMatrix constraints; + AffineConstraints constraints; TableHandler output_table; }; diff --git a/tests/quick_tests/step.cc b/tests/quick_tests/step.cc index 7a7af85c5f..b2366e6b74 100644 --- a/tests/quick_tests/step.cc +++ b/tests/quick_tests/step.cc @@ -72,9 +72,9 @@ private: DoFHandler dof_handler; MappingQ mapping; - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - ConstraintMatrix mean_value_constraints; + SparsityPattern sparsity_pattern; + SparseMatrix system_matrix; + AffineConstraints mean_value_constraints; Vector solution; Vector system_rhs; diff --git a/tests/slepc/step-36_parallel.cc b/tests/slepc/step-36_parallel.cc index 9bcc1fb3b7..d23651c339 100644 --- a/tests/slepc/step-36_parallel.cc +++ b/tests/slepc/step-36_parallel.cc @@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name) dealii::Utilities::MPI::this_mpi_process(mpi_communicator); - dealii::Triangulation triangulation; - dealii::DoFHandler dof_handler(triangulation); - dealii::FE_Q fe(1); - dealii::ConstraintMatrix constraints; - dealii::IndexSet locally_owned_dofs; - dealii::IndexSet locally_relevant_dofs; + dealii::Triangulation triangulation; + dealii::DoFHandler dof_handler(triangulation); + dealii::FE_Q fe(1); + dealii::AffineConstraints constraints; + dealii::IndexSet locally_owned_dofs; + dealii::IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector eigenvalues; diff --git a/tests/slepc/step-36_parallel_02.cc b/tests/slepc/step-36_parallel_02.cc index be7c7b629d..ea58c35b16 100644 --- a/tests/slepc/step-36_parallel_02.cc +++ b/tests/slepc/step-36_parallel_02.cc @@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name) dealii::Utilities::MPI::this_mpi_process(mpi_communicator); - dealii::Triangulation triangulation; - dealii::DoFHandler dof_handler(triangulation); - dealii::FE_Q fe(1); - dealii::ConstraintMatrix constraints; - dealii::IndexSet locally_owned_dofs; - dealii::IndexSet locally_relevant_dofs; + dealii::Triangulation triangulation; + dealii::DoFHandler dof_handler(triangulation); + dealii::FE_Q fe(1); + dealii::AffineConstraints constraints; + dealii::IndexSet locally_owned_dofs; + dealii::IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector eigenvalues; diff --git a/tests/slepc/step-36_parallel_03.cc b/tests/slepc/step-36_parallel_03.cc index fbe6b5f791..394a66acdc 100644 --- a/tests/slepc/step-36_parallel_03.cc +++ b/tests/slepc/step-36_parallel_03.cc @@ -64,12 +64,12 @@ test(std::string solver_name, std::string preconditioner_name) dealii::Utilities::MPI::this_mpi_process(mpi_communicator); - dealii::Triangulation triangulation; - dealii::DoFHandler dof_handler(triangulation); - dealii::FE_Q fe(1); - dealii::ConstraintMatrix constraints; - dealii::IndexSet locally_owned_dofs; - dealii::IndexSet locally_relevant_dofs; + dealii::Triangulation triangulation; + dealii::DoFHandler dof_handler(triangulation); + dealii::FE_Q fe(1); + dealii::AffineConstraints constraints; + dealii::IndexSet locally_owned_dofs; + dealii::IndexSet locally_relevant_dofs; std::vector eigenfunctions; std::vector eigenvalues; diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc index 56161176e2..0050976025 100644 --- a/tests/trilinos/assemble_matrix_parallel_01.cc +++ b/tests/trilinos/assemble_matrix_parallel_01.cc @@ -138,7 +138,7 @@ private: hp::QCollection quadrature_collection; hp::QCollection face_quadrature_collection; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix reference_matrix; TrilinosWrappers::SparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc index a9a315d8d1..e544abce87 100644 --- a/tests/trilinos/assemble_matrix_parallel_02.cc +++ b/tests/trilinos/assemble_matrix_parallel_02.cc @@ -146,7 +146,7 @@ private: FE_Q fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix reference_matrix; TrilinosWrappers::SparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc index 2ffb7f2254..2e6bc792ee 100644 --- a/tests/trilinos/assemble_matrix_parallel_03.cc +++ b/tests/trilinos/assemble_matrix_parallel_03.cc @@ -147,7 +147,7 @@ private: FE_Q fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix reference_matrix; TrilinosWrappers::SparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc index 1995667458..1df7d380ee 100644 --- a/tests/trilinos/assemble_matrix_parallel_04.cc +++ b/tests/trilinos/assemble_matrix_parallel_04.cc @@ -148,7 +148,7 @@ private: FESystem fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::BlockSparseMatrix reference_matrix; TrilinosWrappers::BlockSparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_05.cc b/tests/trilinos/assemble_matrix_parallel_05.cc index b7246888a6..5fc2b6c22d 100644 --- a/tests/trilinos/assemble_matrix_parallel_05.cc +++ b/tests/trilinos/assemble_matrix_parallel_05.cc @@ -148,7 +148,7 @@ private: FE_Q fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix reference_matrix; TrilinosWrappers::SparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_06.cc b/tests/trilinos/assemble_matrix_parallel_06.cc index a6fb1020e8..01704cb098 100644 --- a/tests/trilinos/assemble_matrix_parallel_06.cc +++ b/tests/trilinos/assemble_matrix_parallel_06.cc @@ -150,7 +150,7 @@ private: FESystem fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::BlockSparseMatrix reference_matrix; TrilinosWrappers::BlockSparseMatrix test_matrix; diff --git a/tests/trilinos/assemble_matrix_parallel_07.cc b/tests/trilinos/assemble_matrix_parallel_07.cc index cec8da9cf7..31411f1ab8 100644 --- a/tests/trilinos/assemble_matrix_parallel_07.cc +++ b/tests/trilinos/assemble_matrix_parallel_07.cc @@ -147,7 +147,7 @@ private: FE_Q fe; QGauss quadrature; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix reference_matrix; TrilinosWrappers::SparseMatrix test_matrix; diff --git a/tests/trilinos/direct_solver.cc b/tests/trilinos/direct_solver.cc index 8597f2fa3f..0253126c1f 100644 --- a/tests/trilinos/direct_solver.cc +++ b/tests/trilinos/direct_solver.cc @@ -64,7 +64,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/direct_solver_2.cc b/tests/trilinos/direct_solver_2.cc index 7efee49f9b..07207e423e 100644 --- a/tests/trilinos/direct_solver_2.cc +++ b/tests/trilinos/direct_solver_2.cc @@ -70,8 +70,8 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/direct_solver_3.cc b/tests/trilinos/direct_solver_3.cc index 1357a0ce38..784c0f6eb9 100644 --- a/tests/trilinos/direct_solver_3.cc +++ b/tests/trilinos/direct_solver_3.cc @@ -72,8 +72,8 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - SparsityPattern sparsity_pattern; + AffineConstraints constraints; + SparsityPattern sparsity_pattern; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/n_nonzeros_02.cc b/tests/trilinos/n_nonzeros_02.cc index 884c8b46e4..aa649dfa1a 100644 --- a/tests/trilinos/n_nonzeros_02.cc +++ b/tests/trilinos/n_nonzeros_02.cc @@ -50,7 +50,7 @@ test() DoFTools::make_sparsity_pattern(dof_handler, coupling, sparsity, - ConstraintMatrix(), + AffineConstraints(), false, Utilities::MPI::this_mpi_process( MPI_COMM_WORLD)); diff --git a/tests/trilinos/n_nonzeros_02_parallel.cc b/tests/trilinos/n_nonzeros_02_parallel.cc index 998579172e..b7ee1737ec 100644 --- a/tests/trilinos/n_nonzeros_02_parallel.cc +++ b/tests/trilinos/n_nonzeros_02_parallel.cc @@ -61,7 +61,7 @@ test() DoFTools::make_sparsity_pattern(dof_handler, coupling, sparsity, - ConstraintMatrix(), + AffineConstraints(), false, Utilities::MPI::this_mpi_process( MPI_COMM_WORLD)); diff --git a/tests/trilinos/precondition.cc b/tests/trilinos/precondition.cc index 5ed41277b0..1e0f576787 100644 --- a/tests/trilinos/precondition.cc +++ b/tests/trilinos/precondition.cc @@ -65,7 +65,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/precondition_amg_smoother.cc b/tests/trilinos/precondition_amg_smoother.cc index e261e0a1cd..62101399b3 100644 --- a/tests/trilinos/precondition_amg_smoother.cc +++ b/tests/trilinos/precondition_amg_smoother.cc @@ -64,7 +64,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/precondition_muelu_q_iso_q1.cc b/tests/trilinos/precondition_muelu_q_iso_q1.cc index 10109d020a..31b860e145 100644 --- a/tests/trilinos/precondition_muelu_q_iso_q1.cc +++ b/tests/trilinos/precondition_muelu_q_iso_q1.cc @@ -70,7 +70,7 @@ private: FE_Q_iso_Q1 fe_precondition; DoFHandler dof_handler_precondition; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; TrilinosWrappers::SparseMatrix preconditioner_matrix; diff --git a/tests/trilinos/precondition_muelu_smoother.cc b/tests/trilinos/precondition_muelu_smoother.cc index ca417086d8..09d2c6eadf 100644 --- a/tests/trilinos/precondition_muelu_smoother.cc +++ b/tests/trilinos/precondition_muelu_smoother.cc @@ -64,7 +64,7 @@ private: FE_Q fe; DoFHandler dof_handler; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; diff --git a/tests/trilinos/precondition_q_iso_q1.cc b/tests/trilinos/precondition_q_iso_q1.cc index a3f3961960..898a744487 100644 --- a/tests/trilinos/precondition_q_iso_q1.cc +++ b/tests/trilinos/precondition_q_iso_q1.cc @@ -70,7 +70,7 @@ private: FE_Q_iso_Q1 fe_precondition; DoFHandler dof_handler_precondition; - ConstraintMatrix constraints; + AffineConstraints constraints; TrilinosWrappers::SparseMatrix system_matrix; TrilinosWrappers::SparseMatrix preconditioner_matrix; diff --git a/tests/trilinos/renumbering_01.cc b/tests/trilinos/renumbering_01.cc index 356f9fbd1a..8675ca411d 100644 --- a/tests/trilinos/renumbering_01.cc +++ b/tests/trilinos/renumbering_01.cc @@ -62,7 +62,7 @@ private: FE_Q<2> fe; - ConstraintMatrix constraints; + AffineConstraints constraints; IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; diff --git a/tests/trilinos/solver_control_06.cc b/tests/trilinos/solver_control_06.cc index 5544bbda23..09ae45f960 100644 --- a/tests/trilinos/solver_control_06.cc +++ b/tests/trilinos/solver_control_06.cc @@ -109,7 +109,7 @@ private: IndexSet locally_owned_dofs; IndexSet locally_relevant_dofs; - ConstraintMatrix constraints; + AffineConstraints constraints; LA::MPI::SparseMatrix system_matrix; LA::MPI::Vector locally_relevant_solution; diff --git a/tests/trilinos/trilinos_sparsity_pattern_02.cc b/tests/trilinos/trilinos_sparsity_pattern_02.cc index cd2c3a861c..58e0df4ef0 100644 --- a/tests/trilinos/trilinos_sparsity_pattern_02.cc +++ b/tests/trilinos/trilinos_sparsity_pattern_02.cc @@ -59,9 +59,9 @@ namespace Step22 FESystem fe; DoFHandler dof_handler; - ConstraintMatrix constraints; - std::vector owned_partitioning; - std::vector relevant_partitioning; + AffineConstraints constraints; + std::vector owned_partitioning; + std::vector relevant_partitioning; }; @@ -111,7 +111,7 @@ namespace Step22 locally_relevant_dofs.get_view(n_u, n_u + n_p)); } - ConstraintMatrix new_constraints; + AffineConstraints new_constraints; new_constraints.close(); { TrilinosWrappers::BlockSparsityPattern bsp(owned_partitioning, diff --git a/tests/trilinos/trilinos_sparsity_pattern_05.cc b/tests/trilinos/trilinos_sparsity_pattern_05.cc index 1fc7088dac..c80705b6be 100644 --- a/tests/trilinos/trilinos_sparsity_pattern_05.cc +++ b/tests/trilinos/trilinos_sparsity_pattern_05.cc @@ -50,7 +50,7 @@ test() DoFTools::extract_locally_relevant_dofs(dh, relevant_partitioning); // generate empty constraints - ConstraintMatrix constraints; + AffineConstraints constraints; // generate sparsity pattern TrilinosWrappers::SparsityPattern sp(dh.locally_owned_dofs(),