From: Marc Fehling Date: Fri, 4 Jul 2025 14:33:10 +0000 (+0200) Subject: Fix Affineconstraints deprecations by initializing with `(locally_owned_dofs, locally... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d82ec5d653218313b1a3d3af0c82131ad794ad;p=dealii.git Fix Affineconstraints deprecations by initializing with `(locally_owned_dofs, locally_relevant_dofs)`. --- diff --git a/examples/step-90/step-90.cc b/examples/step-90/step-90.cc index 4cc16e141e..8e156f93b7 100644 --- a/examples/step-90/step-90.cc +++ b/examples/step-90/step-90.cc @@ -666,7 +666,8 @@ namespace Step90 level_set_constraints.clear(); const IndexSet level_set_locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(level_set_dof_handler); - level_set_constraints.reinit(level_set_locally_relevant_dofs); + level_set_constraints.reinit(level_set_dof_handler.locally_owned_dofs(), + level_set_locally_relevant_dofs); DoFTools::make_hanging_node_constraints(level_set_dof_handler, level_set_constraints); level_set_constraints.close(); diff --git a/tests/arpack/parpack_advection_diffusion_petsc.cc b/tests/arpack/parpack_advection_diffusion_petsc.cc index 2abfdb93cf..5720c1bb51 100644 --- a/tests/arpack/parpack_advection_diffusion_petsc.cc +++ b/tests/arpack/parpack_advection_diffusion_petsc.cc @@ -190,7 +190,7 @@ test() dealii::DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); dealii::VectorTools::interpolate_boundary_values( dof_handler, 0, dealii::Functions::ZeroFunction(), constraints); diff --git a/tests/arpack/parpack_advection_diffusion_trilinos.cc b/tests/arpack/parpack_advection_diffusion_trilinos.cc index ae4b9af7be..2ed14a4e8e 100644 --- a/tests/arpack/parpack_advection_diffusion_trilinos.cc +++ b/tests/arpack/parpack_advection_diffusion_trilinos.cc @@ -164,7 +164,7 @@ test() locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/arpack/step-36_parpack.cc b/tests/arpack/step-36_parpack.cc index cf8ca79f39..f642db32ee 100644 --- a/tests/arpack/step-36_parpack.cc +++ b/tests/arpack/step-36_parpack.cc @@ -192,7 +192,7 @@ test() dealii::DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); dealii::VectorTools::interpolate_boundary_values( dof_handler, 0, dealii::Functions::ZeroFunction(), constraints); diff --git a/tests/arpack/step-36_parpack_mf.cc b/tests/arpack/step-36_parpack_mf.cc index ee2fda0253..1dd7270dbc 100644 --- a/tests/arpack/step-36_parpack_mf.cc +++ b/tests/arpack/step-36_parpack_mf.cc @@ -85,7 +85,7 @@ test() const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/arpack/step-36_parpack_mf_02.cc b/tests/arpack/step-36_parpack_mf_02.cc index 6d82b81f97..8ed6169783 100644 --- a/tests/arpack/step-36_parpack_mf_02.cc +++ b/tests/arpack/step-36_parpack_mf_02.cc @@ -85,7 +85,7 @@ test() const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/arpack/step-36_parpack_mf_03.cc b/tests/arpack/step-36_parpack_mf_03.cc index 86411478d2..d6a824b0d9 100644 --- a/tests/arpack/step-36_parpack_mf_03.cc +++ b/tests/arpack/step-36_parpack_mf_03.cc @@ -86,7 +86,7 @@ test() const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/arpack/step-36_parpack_trilinos.cc b/tests/arpack/step-36_parpack_trilinos.cc index 25d67a9545..8fd75373e9 100644 --- a/tests/arpack/step-36_parpack_trilinos.cc +++ b/tests/arpack/step-36_parpack_trilinos.cc @@ -166,7 +166,7 @@ test() locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/dofs/dof_tools_04a.cc b/tests/dofs/dof_tools_04a.cc index f98b51ee95..8bb1d7305d 100644 --- a/tests/dofs/dof_tools_04a.cc +++ b/tests/dofs/dof_tools_04a.cc @@ -55,7 +55,8 @@ check_this(const DoFHandler &dof_handler) const IndexSet is_hanging_node_constrained = DoFTools::extract_hanging_node_dofs(dof_handler); - AffineConstraints constraints(locally_relevant_dofs); + AffineConstraints constraints(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); 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 dce5f7e4bc..f631c7aabe 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) DoFTools::extract_locally_relevant_dofs(dh); AffineConstraints cm; - cm.reinit(locally_relevant_set); + cm.reinit(dh.locally_owned_dofs(), 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_04.cc b/tests/dofs/dof_tools_extract_dofs_with_support_contained_within_04.cc index 68a8258613..d2431a41d5 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() DoFTools::extract_locally_relevant_dofs(dh); AffineConstraints cm; - cm.reinit(locally_relevant_set); + cm.reinit(locally_owned_set, locally_relevant_set); DoFTools::make_hanging_node_constraints(dh, cm); cm.close(); diff --git a/tests/fe/fe_enriched_color_07.cc b/tests/fe/fe_enriched_color_07.cc index 6d2b36fa06..fe4fa640dd 100644 --- a/tests/fe/fe_enriched_color_07.cc +++ b/tests/fe/fe_enriched_color_07.cc @@ -1442,7 +1442,7 @@ LaplaceProblem::setup_system() locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); SigmaFunction boundary_value_func; diff --git a/tests/fe/fe_enriched_step-36.cc b/tests/fe/fe_enriched_step-36.cc index d3ee839533..156b293222 100644 --- a/tests/fe/fe_enriched_step-36.cc +++ b/tests/fe/fe_enriched_step-36.cc @@ -290,7 +290,7 @@ namespace Step36 DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc index 5ccbb381a1..7ae746b656 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -300,7 +300,7 @@ namespace Step36 DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/gla/block_mat_02.cc b/tests/gla/block_mat_02.cc index 61e94e486e..e7e6f20a32 100644 --- a/tests/gla/block_mat_02.cc +++ b/tests/gla/block_mat_02.cc @@ -97,7 +97,7 @@ test() stokes_relevant_set.print(deallog.get_file_stream()); - AffineConstraints cm(stokes_relevant_set); + AffineConstraints cm(stokes_index_set, stokes_relevant_set); DoFTools::make_hanging_node_constraints(stokes_dof_handler, cm); @@ -190,7 +190,7 @@ test_LA_Trilinos() stokes_relevant_set.get_view(n_u, n_u + n_p)); stokes_relevant_set.print(deallog.get_file_stream()); - AffineConstraints cm(stokes_relevant_set); + AffineConstraints cm(stokes_index_set, 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 bc708ba1bf..74c9491e41 100644 --- a/tests/gla/block_mat_03.cc +++ b/tests/gla/block_mat_03.cc @@ -103,7 +103,8 @@ test() using number = typename LA::MPI::BlockSparseMatrix::value_type; - AffineConstraints constraints(locally_relevant_dofs); + AffineConstraints constraints(locally_owned_dofs, + locally_relevant_dofs); constraints.close(); BlockDynamicSparsityPattern bcsp(locally_relevant_partitioning); @@ -207,7 +208,8 @@ test_alt() locally_relevant_dofs.print(deallog); - AffineConstraints constraints(locally_relevant_dofs); + AffineConstraints constraints(locally_owned_dofs, + locally_relevant_dofs); constraints.close(); TrilinosWrappers::BlockSparsityPattern sp(locally_owned_partitioning, diff --git a/tests/hp/laplace.h b/tests/hp/laplace.h index eaa770f399..f9f635af16 100644 --- a/tests/hp/laplace.h +++ b/tests/hp/laplace.h @@ -269,7 +269,7 @@ Laplace::setup_system() system_rhs = 0; constraints.clear(); - // constraints.reinit(locally_relevant_dofs); + // constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/diagonal_matrix_02.cc b/tests/lac/diagonal_matrix_02.cc index 96e281c5d7..097e2d418a 100644 --- a/tests/lac/diagonal_matrix_02.cc +++ b/tests/lac/diagonal_matrix_02.cc @@ -69,7 +69,7 @@ test(const bool hanging_nodes = true) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/lac/linear_operator_12.cc b/tests/lac/linear_operator_12.cc index 675bfd2919..eeb210e56e 100644 --- a/tests/lac/linear_operator_12.cc +++ b/tests/lac/linear_operator_12.cc @@ -184,19 +184,18 @@ Step4::setup_system() { dof_handler.distribute_dofs(fe); + const IndexSet &locally_owned_dofs = dof_handler.locally_owned_dofs(); + const IndexSet locally_relevant_dofs = + DoFTools::extract_locally_relevant_dofs(dof_handler); + constraints.clear(); - constraints.reinit(dof_handler.locally_owned_dofs(), - DoFTools::extract_locally_relevant_dofs(dof_handler)); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); VectorTools::interpolate_boundary_values(dof_handler, 0, BoundaryValues(), constraints); constraints.close(); - const IndexSet &locally_owned_dofs = dof_handler.locally_owned_dofs(); - const IndexSet locally_relevant_dofs = - DoFTools::extract_locally_relevant_dofs(dof_handler); - DynamicSparsityPattern dsp(locally_relevant_dofs); DoFTools::make_sparsity_pattern(dof_handler, dsp, constraints, false); SparsityTools::distribute_sparsity_pattern(dsp, diff --git a/tests/lac/linear_operator_12a.cc b/tests/lac/linear_operator_12a.cc index 1e80b6298a..578cfb9ca4 100644 --- a/tests/lac/linear_operator_12a.cc +++ b/tests/lac/linear_operator_12a.cc @@ -185,19 +185,18 @@ Step4::setup_system() { dof_handler.distribute_dofs(fe); + const IndexSet &locally_owned_dofs = dof_handler.locally_owned_dofs(); + const IndexSet locally_relevant_dofs = + DoFTools::extract_locally_relevant_dofs(dof_handler); + constraints.clear(); - constraints.reinit(dof_handler.locally_owned_dofs(), - DoFTools::extract_locally_relevant_dofs(dof_handler)); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); VectorTools::interpolate_boundary_values(dof_handler, 0, BoundaryValues(), constraints); constraints.close(); - const IndexSet &locally_owned_dofs = dof_handler.locally_owned_dofs(); - const IndexSet locally_relevant_dofs = - DoFTools::extract_locally_relevant_dofs(dof_handler); - DynamicSparsityPattern dsp(locally_relevant_dofs); DoFTools::make_sparsity_pattern(dof_handler, dsp, constraints, false); SparsityTools::distribute_sparsity_pattern(dsp, diff --git a/tests/lac/linear_operator_14.cc b/tests/lac/linear_operator_14.cc index d7b3382c99..228d0f355d 100644 --- a/tests/lac/linear_operator_14.cc +++ b/tests/lac/linear_operator_14.cc @@ -112,7 +112,7 @@ build_matrix_vector(TrilinosWrappers::BlockSparseMatrix &matrix, dofs_per_block[0] + dofs_per_block[1])); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); constraints.close(); // See diff --git a/tests/lac/step-40-linear_operator_01.cc b/tests/lac/step-40-linear_operator_01.cc index 7ced2f4845..c694f76e3b 100644 --- a/tests/lac/step-40-linear_operator_01.cc +++ b/tests/lac/step-40-linear_operator_01.cc @@ -132,7 +132,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/step-40-linear_operator_02.cc b/tests/lac/step-40-linear_operator_02.cc index 7d822280bc..a32d351deb 100644 --- a/tests/lac/step-40-linear_operator_02.cc +++ b/tests/lac/step-40-linear_operator_02.cc @@ -132,7 +132,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/step-40-linear_operator_03.cc b/tests/lac/step-40-linear_operator_03.cc index 52da8df488..6c8d731e87 100644 --- a/tests/lac/step-40-linear_operator_03.cc +++ b/tests/lac/step-40-linear_operator_03.cc @@ -133,7 +133,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/step-40-linear_operator_04.cc b/tests/lac/step-40-linear_operator_04.cc index 11edae8ed1..ff894c70db 100644 --- a/tests/lac/step-40-linear_operator_04.cc +++ b/tests/lac/step-40-linear_operator_04.cc @@ -133,7 +133,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/step-40-linear_operator_05.cc b/tests/lac/step-40-linear_operator_05.cc index c582dcb41c..c30fac1769 100644 --- a/tests/lac/step-40-linear_operator_05.cc +++ b/tests/lac/step-40-linear_operator_05.cc @@ -133,7 +133,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/step-40-linear_operator_06.cc b/tests/lac/step-40-linear_operator_06.cc index 59aaec6402..68fc041efa 100644 --- a/tests/lac/step-40-linear_operator_06.cc +++ b/tests/lac/step-40-linear_operator_06.cc @@ -133,7 +133,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/lac/utilities_02.cc b/tests/lac/utilities_02.cc index 86a8f14105..cd06a0df45 100644 --- a/tests/lac/utilities_02.cc +++ b/tests/lac/utilities_02.cc @@ -96,7 +96,7 @@ test() const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mappings/mapping_q_eulerian_08.cc b/tests/mappings/mapping_q_eulerian_08.cc index 8a9a82f40b..6e59c0d280 100644 --- a/tests/mappings/mapping_q_eulerian_08.cc +++ b/tests/mappings/mapping_q_eulerian_08.cc @@ -166,12 +166,13 @@ test(const unsigned int n_ref = 0) // constraints: AffineConstraints constraints_euler; - constraints_euler.reinit(locally_relevant_dofs_euler); + constraints_euler.reinit(locally_owned_dofs_euler, + locally_relevant_dofs_euler); DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler); constraints_euler.close(); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints_euler.close(); @@ -292,7 +293,8 @@ test(const unsigned int n_ref = 0) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/mappings/mapping_q_eulerian_09.cc b/tests/mappings/mapping_q_eulerian_09.cc index 67c67799ca..30e362b601 100644 --- a/tests/mappings/mapping_q_eulerian_09.cc +++ b/tests/mappings/mapping_q_eulerian_09.cc @@ -110,12 +110,13 @@ test() // constraints: AffineConstraints constraints_euler; - constraints_euler.reinit(locally_relevant_dofs_euler); + constraints_euler.reinit(locally_owned_dofs_euler, + locally_relevant_dofs_euler); DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler); constraints_euler.close(); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints_euler.close(); diff --git a/tests/mappings/mapping_q_eulerian_14.cc b/tests/mappings/mapping_q_eulerian_14.cc index 47cb3eb1ea..33405012e1 100644 --- a/tests/mappings/mapping_q_eulerian_14.cc +++ b/tests/mappings/mapping_q_eulerian_14.cc @@ -208,12 +208,13 @@ test(const unsigned int n_ref = 0) // constraints: AffineConstraints constraints_euler; - constraints_euler.reinit(locally_relevant_dofs_euler); + constraints_euler.reinit(locally_owned_dofs_euler, + locally_relevant_dofs_euler); DoFTools::make_hanging_node_constraints(dof_handler_euler, constraints_euler); constraints_euler.close(); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); @@ -333,7 +334,8 @@ test(const unsigned int n_ref = 0) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/cell_categorization_02.cc b/tests/matrix_free/cell_categorization_02.cc index 62702d26b6..8715fa3391 100644 --- a/tests/matrix_free/cell_categorization_02.cc +++ b/tests/matrix_free/cell_categorization_02.cc @@ -147,7 +147,7 @@ test() AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/compute_diagonal_02.cc b/tests/matrix_free/compute_diagonal_02.cc index ce9e714a19..53a9cecadf 100644 --- a/tests/matrix_free/compute_diagonal_02.cc +++ b/tests/matrix_free/compute_diagonal_02.cc @@ -69,7 +69,7 @@ test() const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/matrix_free/dof_info_01.cc b/tests/matrix_free/dof_info_01.cc index e355c037d9..cd44792177 100644 --- a/tests/matrix_free/dof_info_01.cc +++ b/tests/matrix_free/dof_info_01.cc @@ -75,7 +75,7 @@ test(const bool adaptive_ref = true) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); // constrain bottom part of the boundary (lower in y direction) VectorTools::interpolate_boundary_values(dof, diff --git a/tests/matrix_free/dof_info_02.cc b/tests/matrix_free/dof_info_02.cc index 59d9cebc12..302d5e6e2a 100644 --- a/tests/matrix_free/dof_info_02.cc +++ b/tests/matrix_free/dof_info_02.cc @@ -77,7 +77,7 @@ test(const bool adaptive_ref = true) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); // constrain bottom part of the boundary (lower in y direction) VectorTools::interpolate_boundary_values(dof, diff --git a/tests/matrix_free/interpolate_to_mg.cc b/tests/matrix_free/interpolate_to_mg.cc index 1a738722e9..158174a864 100644 --- a/tests/matrix_free/interpolate_to_mg.cc +++ b/tests/matrix_free/interpolate_to_mg.cc @@ -133,7 +133,7 @@ test(const unsigned int n_glob_ref = 2, const unsigned int n_ref = 0) // constraints: AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index 0615c840c3..f34c0f9dd8 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -90,7 +90,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 4935a8798b..083c880797 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -131,7 +131,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/laplace_operator_03.cc b/tests/matrix_free/laplace_operator_03.cc index a1fb3ca8b7..821a7b7d01 100644 --- a/tests/matrix_free/laplace_operator_03.cc +++ b/tests/matrix_free/laplace_operator_03.cc @@ -85,7 +85,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/laplace_operator_05.cc b/tests/matrix_free/laplace_operator_05.cc index 1a3756e36b..ebff637566 100644 --- a/tests/matrix_free/laplace_operator_05.cc +++ b/tests/matrix_free/laplace_operator_05.cc @@ -91,7 +91,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 3900c0f00e..1598946c28 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -97,7 +97,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 296c637ed7..30c24410a0 100644 --- a/tests/matrix_free/mass_operator_02.cc +++ b/tests/matrix_free/mass_operator_02.cc @@ -62,7 +62,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 7eb7684528..8afe150a0e 100644 --- a/tests/matrix_free/mass_operator_03.cc +++ b/tests/matrix_free/mass_operator_03.cc @@ -63,7 +63,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 1bf88214ba..03c224db8c 100644 --- a/tests/matrix_free/mass_operator_04.cc +++ b/tests/matrix_free/mass_operator_04.cc @@ -58,8 +58,8 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints_0(relevant_set), - constraints_1(relevant_set); + AffineConstraints constraints_0(owned_set, relevant_set), + constraints_1(owned_set, relevant_set); VectorTools::interpolate_boundary_values(dof, 0, Functions::ZeroFunction(), diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index 07af8c270d..273e544186 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); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 f878620eb4..9990cd7f16 100644 --- a/tests/matrix_free/matrix_vector_11.cc +++ b/tests/matrix_free/matrix_vector_11.cc @@ -89,7 +89,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 824a9e1451..f8f5536743 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -154,7 +154,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 da1e600146..603785ba11 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -152,7 +152,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); 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 5dadfb9247..6a884aa822 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -90,7 +90,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); 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 3cac8a93cd..18c1fb3095 100644 --- a/tests/matrix_free/matrix_vector_22.cc +++ b/tests/matrix_free/matrix_vector_22.cc @@ -155,7 +155,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 e71dd2ceb6..729eb5aa8a 100644 --- a/tests/matrix_free/matrix_vector_23.cc +++ b/tests/matrix_free/matrix_vector_23.cc @@ -167,7 +167,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_26.cc b/tests/matrix_free/matrix_vector_26.cc index 0505d6af53..25a2a1c927 100644 --- a/tests/matrix_free/matrix_vector_26.cc +++ b/tests/matrix_free/matrix_vector_26.cc @@ -91,7 +91,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_27.cc b/tests/matrix_free/matrix_vector_27.cc index 810b7d0c24..6ceb8b7083 100644 --- a/tests/matrix_free/matrix_vector_27.cc +++ b/tests/matrix_free/matrix_vector_27.cc @@ -68,7 +68,7 @@ test() IndexSet relevant_set; DoFTools::extract_locally_relevant_dofs(dof, relevant_set); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 161b9a6c19..51c0f3f69a 100644 --- a/tests/matrix_free/matrix_vector_blocks.cc +++ b/tests/matrix_free/matrix_vector_blocks.cc @@ -135,7 +135,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/matrix_vector_large_degree_02.cc b/tests/matrix_free/matrix_vector_large_degree_02.cc index da47c9af52..72c3f02c94 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() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 047a0a8d86..cc36986e3a 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -107,7 +107,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -174,7 +174,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index 74b0ca5b15..7c1a997d71 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -79,7 +79,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -87,9 +87,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -98,8 +100,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -478,7 +478,8 @@ do_test(const DoFHandler &dof) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index c1dcbc6201..e65ad7c017 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -108,7 +108,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -153,7 +153,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -188,7 +189,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index 6d21864016..f0fbf1b5cd 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -86,7 +86,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -94,9 +94,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -105,8 +107,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -482,7 +482,8 @@ do_test(const DoFHandler &dof, const bool threaded) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index 77d528149c..606c59be45 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -108,7 +108,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -153,7 +153,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -188,7 +189,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc index ab2de8241a..5e9cbb12b0 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc @@ -83,7 +83,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -91,9 +91,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -102,8 +104,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -479,7 +479,8 @@ do_test(const DoFHandler &dof, const bool threaded) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index 9083ac6fe7..44c1a6a404 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) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -279,7 +279,8 @@ do_test(const DoFHandler &dof, const unsigned int nb) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -316,7 +317,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index 77ddfadfbd..925862c2bf 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -109,7 +109,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -154,7 +154,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -189,7 +190,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index d3937c2c88..aa946558b0 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -252,7 +252,8 @@ do_test(const std::vector *> &dof) std::vector *> constraints_ptrs(dof.size()); for (unsigned int i = 0; i < dof.size(); ++i) { - constraints[i].reinit(locally_relevant_dofs[i]); + constraints[i].reinit(dof[i]->locally_owned_dofs(), + locally_relevant_dofs[i]); DoFTools::make_hanging_node_constraints(*dof[i], constraints[i]); VectorTools::interpolate_boundary_values(*dof[i], dirichlet_boundary, @@ -301,7 +302,8 @@ do_test(const std::vector *> &dof) // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs[b]); + hanging_node_constraints.reinit(dof[b]->locally_owned_dofs(), + locally_relevant_dofs[b]); DoFTools::make_hanging_node_constraints(*dof[b], hanging_node_constraints); hanging_node_constraints.close(); @@ -350,7 +352,8 @@ do_test(const std::vector *> &dof) { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(*dof[i], level); - level_constraints[i].reinit(relevant_dofs); + level_constraints[i].reinit(dof[i]->locally_owned_mg_dofs(level), + relevant_dofs); level_constraints[i].add_lines( mg_constrained_dofs[i].get_boundary_indices(level)); level_constraints[i].close(); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_08.cc b/tests/matrix_free/parallel_multigrid_adaptive_08.cc index 4d0208ddf7..168b2caf9f 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_08.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_08.cc @@ -226,7 +226,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -266,7 +266,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -296,7 +297,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/parallel_multigrid_mf_02.cc b/tests/matrix_free/parallel_multigrid_mf_02.cc index 7bac0350a3..223d0dfee4 100644 --- a/tests/matrix_free/parallel_multigrid_mf_02.cc +++ b/tests/matrix_free/parallel_multigrid_mf_02.cc @@ -107,7 +107,7 @@ do_test(const DoFHandler &dof) const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, constraints); @@ -161,7 +161,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/pre_and_post_loops_02.cc b/tests/matrix_free/pre_and_post_loops_02.cc index dd690aba27..def6fefd78 100644 --- a/tests/matrix_free/pre_and_post_loops_02.cc +++ b/tests/matrix_free/pre_and_post_loops_02.cc @@ -141,7 +141,7 @@ test() dof.distribute_dofs(fe); AffineConstraints constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - constraints.reinit(relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), relevant_dofs); VectorTools::interpolate_boundary_values(dof, 0, Functions::ZeroFunction(), diff --git a/tests/matrix_free/solver_cg_interleave.cc b/tests/matrix_free/solver_cg_interleave.cc index 1539f7bc56..bc1ce25761 100644 --- a/tests/matrix_free/solver_cg_interleave.cc +++ b/tests/matrix_free/solver_cg_interleave.cc @@ -192,23 +192,27 @@ test(const unsigned int fe_degree) DoFHandler dof(tria); dof.distribute_dofs(fe); - IndexSet owned_set = dof.locally_owned_dofs(); - IndexSet relevant_set; - AffineConstraints constraints(relevant_set); typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; + IndexSet relevant_set; + AffineConstraints constraints; { + constraints.clear(); relevant_set = DoFTools::extract_locally_relevant_dofs(dof); + constraints.reinit(dof.locally_owned_dofs(), relevant_set); constraints.close(); - - DoFRenumbering::matrix_free_data_locality(dof, constraints, addit_data); } - constraints.clear(); - relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - constraints.close(); + DoFRenumbering::matrix_free_data_locality(dof, constraints, addit_data); + + { + constraints.clear(); + relevant_set = DoFTools::extract_locally_relevant_dofs(dof); + constraints.reinit(dof.locally_owned_dofs(), relevant_set); + constraints.close(); + } const QGauss<1> quadrature(dof.get_fe().degree + 1); MatrixFree mf_data; diff --git a/tests/matrix_free/step-37-inhomogeneous-1.cc b/tests/matrix_free/step-37-inhomogeneous-1.cc index 65b44279a4..744016e343 100644 --- a/tests/matrix_free/step-37-inhomogeneous-1.cc +++ b/tests/matrix_free/step-37-inhomogeneous-1.cc @@ -402,7 +402,7 @@ namespace Step37 DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, @@ -444,7 +444,8 @@ namespace Step37 const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index c7a737fb6c..90bc1605bd 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -296,7 +296,7 @@ namespace Step48 locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index 104255db82..ff860038c9 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -266,7 +266,7 @@ namespace Step48 locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/matrix_free/stokes_computation.cc b/tests/matrix_free/stokes_computation.cc index cf8f976ec9..adfd4b9e79 100644 --- a/tests/matrix_free/stokes_computation.cc +++ b/tests/matrix_free/stokes_computation.cc @@ -1040,7 +1040,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u.reinit(locally_relevant_dofs_u); + constraints_u.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u); VectorTools::interpolate_boundary_values( @@ -1049,7 +1050,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_p = DoFTools::extract_locally_relevant_dofs(dof_handler_p); - constraints_p.reinit(locally_relevant_dofs_p); + constraints_p.reinit(dof_handler_p.locally_owned_dofs(), + locally_relevant_dofs_p); DoFTools::make_hanging_node_constraints(dof_handler_p, constraints_p); constraints_p.close(); @@ -1116,7 +1118,8 @@ namespace StokesClass const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler_u, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler_u.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); @@ -1171,7 +1174,8 @@ namespace StokesClass AffineConstraints constraints_u_no_dirchlet; const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u_no_dirchlet.reinit(locally_relevant_dofs_u); + constraints_u_no_dirchlet.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u_no_dirchlet); constraints_u_no_dirchlet.close(); diff --git a/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc index 6eb2499267..5f764b548e 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc @@ -70,7 +70,7 @@ test() deallog << "locally relevant dofs :" << std::endl; relevant_set.print(deallog.get_file_stream()); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); constraints.close(); MappingQ mapping(fe_degree); diff --git a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc index 65e2f78368..080c28d357 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc @@ -93,7 +93,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc index 418c8eb4f7..b7b9f46bb7 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc @@ -95,7 +95,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc index 30ca22b1b5..ca73f861b4 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc @@ -89,7 +89,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc index 9ebdc1ec5f..e217f9bd88 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc @@ -95,7 +95,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc index a68eb050c8..bbc3a1cc9e 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc @@ -101,7 +101,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc b/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc index 0e8391b8b7..050cf6755e 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc @@ -94,7 +94,7 @@ test() const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc b/tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc index fc33408e1d..895a6d4159 100644 --- a/tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc @@ -58,7 +58,7 @@ test() deallog << "locally relevant dofs :" << std::endl; owned_set.print(deallog.get_file_stream()); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/meshworker/step-50-mesh_loop.cc b/tests/meshworker/step-50-mesh_loop.cc index 366dd2b6cb..738207ca2c 100644 --- a/tests/meshworker/step-50-mesh_loop.cc +++ b/tests/meshworker/step-50-mesh_loop.cc @@ -236,7 +236,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); const std::set dirichlet_boundary_ids = {0}; @@ -363,7 +364,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); boundary_constraints[level].add_lines( mg_constrained_dofs.get_refinement_edge_indices(level)); boundary_constraints[level].add_lines( diff --git a/tests/mpi/constraint_matrix_condense_01.cc b/tests/mpi/constraint_matrix_condense_01.cc index e87ea4e662..c88ff86f05 100644 --- a/tests/mpi/constraint_matrix_condense_01.cc +++ b/tests/mpi/constraint_matrix_condense_01.cc @@ -54,7 +54,8 @@ test() force.reinit(locally_owned_dofs, mpi_communicator); Assert(!force.has_ghost_elements(), ExcInternalError()); - AffineConstraints constraints(locally_relevant_dofs); + AffineConstraints constraints(locally_owned_dofs, + locally_relevant_dofs); constraints.clear(); { const IndexSet boundary_dofs = diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc index bc9fd3acbb..37b2e14e1f 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -88,7 +88,7 @@ test() TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); ComponentMask velocity_mask(dim + 1, true); diff --git a/tests/mpi/constraints_consistent_01.cc b/tests/mpi/constraints_consistent_01.cc index 3956d5acf5..42a8b3e029 100644 --- a/tests/mpi/constraints_consistent_01.cc +++ b/tests/mpi/constraints_consistent_01.cc @@ -58,7 +58,7 @@ check(parallel::distributed::Triangulation &tria) AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); for (unsigned int id = 0; id < 1; ++id) diff --git a/tests/mpi/data_out_faces_01.cc b/tests/mpi/data_out_faces_01.cc index 46e856c8f2..5af3193f58 100644 --- a/tests/mpi/data_out_faces_01.cc +++ b/tests/mpi/data_out_faces_01.cc @@ -121,7 +121,7 @@ namespace pdd // Apply a constant function at the boundary constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values( dof_handler, 0, Functions::ConstantFunction(1.0), constraints); diff --git a/tests/mpi/hp_constraints_consistent_01.cc b/tests/mpi/hp_constraints_consistent_01.cc index 6f5d98d1e8..9ea1909987 100644 --- a/tests/mpi/hp_constraints_consistent_01.cc +++ b/tests/mpi/hp_constraints_consistent_01.cc @@ -107,7 +107,7 @@ test(const unsigned int degree_center, AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dh.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dh, constraints); diff --git a/tests/mpi/hp_constraints_consistent_02.cc b/tests/mpi/hp_constraints_consistent_02.cc index f66b9a6981..69b54665ad 100644 --- a/tests/mpi/hp_constraints_consistent_02.cc +++ b/tests/mpi/hp_constraints_consistent_02.cc @@ -107,7 +107,7 @@ test(const unsigned int degree_center, AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dh.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dh, constraints); diff --git a/tests/mpi/hp_constraints_consistent_03.cc b/tests/mpi/hp_constraints_consistent_03.cc index 9f4d670350..fffb260916 100644 --- a/tests/mpi/hp_constraints_consistent_03.cc +++ b/tests/mpi/hp_constraints_consistent_03.cc @@ -122,7 +122,7 @@ test(const unsigned int degree_center, AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dh.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dh, constraints); diff --git a/tests/mpi/hp_hanging_node_constraints_01.cc b/tests/mpi/hp_hanging_node_constraints_01.cc index 2e3aabd909..3ae0ded75a 100644 --- a/tests/mpi/hp_hanging_node_constraints_01.cc +++ b/tests/mpi/hp_hanging_node_constraints_01.cc @@ -77,7 +77,7 @@ test() DoFTools::extract_locally_relevant_dofs(dh); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dh.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dh, constraints); deallog << "OK" << std::endl; diff --git a/tests/mpi/hp_hanging_node_constraints_02.cc b/tests/mpi/hp_hanging_node_constraints_02.cc index 772e1b53b1..49ec94ae36 100644 --- a/tests/mpi/hp_hanging_node_constraints_02.cc +++ b/tests/mpi/hp_hanging_node_constraints_02.cc @@ -97,7 +97,8 @@ test() DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, hanging_node_constraints); diff --git a/tests/mpi/hp_step-4.cc b/tests/mpi/hp_step-4.cc index 5725bb91f8..74f667bebe 100644 --- a/tests/mpi/hp_step-4.cc +++ b/tests/mpi/hp_step-4.cc @@ -191,7 +191,7 @@ namespace Step4 constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/mpi/hp_step-40.cc b/tests/mpi/hp_step-40.cc index 2b0019cdfe..932d13c2eb 100644 --- a/tests/mpi/hp_step-40.cc +++ b/tests/mpi/hp_step-40.cc @@ -146,7 +146,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/hp_step-40_variable_01.cc b/tests/mpi/hp_step-40_variable_01.cc index d145099bfb..1785714f38 100644 --- a/tests/mpi/hp_step-40_variable_01.cc +++ b/tests/mpi/hp_step-40_variable_01.cc @@ -154,7 +154,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values( dof_handler, 0, Functions::ZeroFunction(), constraints); diff --git a/tests/mpi/interpolate_to_different_mesh_02.cc b/tests/mpi/interpolate_to_different_mesh_02.cc index 59fb4e4c9c..391699fc71 100644 --- a/tests/mpi/interpolate_to_different_mesh_02.cc +++ b/tests/mpi/interpolate_to_different_mesh_02.cc @@ -140,7 +140,7 @@ SeventhProblem::setup_system() system_rhs.reinit(locally_owned_dofs, mpi_communicator); system_rhs = 0; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc index 89fa947236..ec3f804e20 100644 --- a/tests/mpi/make_zero_boundary_values.cc +++ b/tests/mpi/make_zero_boundary_values.cc @@ -53,7 +53,8 @@ test() // locally relevant dofs, so do the test again with that { const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); - AffineConstraints boundary_values(relevant_set); + AffineConstraints boundary_values(dofh.locally_owned_dofs(), + 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/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc index 4220b544c0..495264b003 100644 --- a/tests/mpi/no_flux_constraints.cc +++ b/tests/mpi/no_flux_constraints.cc @@ -106,7 +106,7 @@ test() const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); AffineConstraints constraints; - constraints.reinit(relevant_set); + constraints.reinit(dofh.locally_owned_dofs(), relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(1); diff --git a/tests/mpi/no_flux_constraints_02.cc b/tests/mpi/no_flux_constraints_02.cc index db7060a00b..a89c7c7cf6 100644 --- a/tests/mpi/no_flux_constraints_02.cc +++ b/tests/mpi/no_flux_constraints_02.cc @@ -108,7 +108,7 @@ test() const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); AffineConstraints constraints; - constraints.reinit(relevant_set); + constraints.reinit(dofh.locally_owned_dofs(), relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(1); diff --git a/tests/mpi/no_flux_constraints_03.cc b/tests/mpi/no_flux_constraints_03.cc index 374b6f75e2..66a60d23fd 100644 --- a/tests/mpi/no_flux_constraints_03.cc +++ b/tests/mpi/no_flux_constraints_03.cc @@ -84,7 +84,7 @@ test() const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); AffineConstraints constraints; - constraints.reinit(relevant_set); + constraints.reinit(dofh.locally_owned_dofs(), relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); const std::set no_normal_flux_boundaries = {0}; const unsigned int degree = 1; diff --git a/tests/mpi/normal_flux_constraints.cc b/tests/mpi/normal_flux_constraints.cc index 7054bc1113..f6988f8c2d 100644 --- a/tests/mpi/normal_flux_constraints.cc +++ b/tests/mpi/normal_flux_constraints.cc @@ -105,7 +105,7 @@ test() const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); AffineConstraints constraints; - constraints.reinit(relevant_set); + constraints.reinit(dofh.locally_owned_dofs(), relevant_set); DoFTools::make_hanging_node_constraints(dofh, constraints); std::set no_normal_flux_boundaries; no_normal_flux_boundaries.insert(1); diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index 07aedae22e..40a3d270c1 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -62,7 +62,7 @@ test() AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - AffineConstraints cm2(dof_set); + AffineConstraints cm2(dofh.locally_owned_dofs(), 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 3a431fdbdb..d57dad20fb 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -64,7 +64,7 @@ test() AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - AffineConstraints cm2(dof_set); + AffineConstraints cm2(dofh.locally_owned_dofs(), 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 4fb480f986..ee298ef967 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -97,7 +97,7 @@ test(const bool use_manifold_for_normal, const Mapping &mapping) TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); ComponentMask velocity_mask(dim + 1, true); diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index 10cd178b85..e0190d4008 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -204,7 +204,7 @@ test() x_rel.reinit(relevant_set, MPI_COMM_WORLD); - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, 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 e135e22770..a6d9468c3c 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_05.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc @@ -68,7 +68,7 @@ test() // AffineConstraints::distribute should not do // anything x1 = x_ref; - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, 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 17d544f779..0f2d193158 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -72,7 +72,7 @@ test() AffineConstraints cm; DoFTools::make_hanging_node_constraints(dofh, cm); - AffineConstraints cm2(dof_set); + AffineConstraints cm2(dofh.locally_owned_dofs(), 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 55776b50e1..a84622206b 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -80,7 +80,7 @@ test() TrilinosWrappers::MPI::Vector x_rel; x_rel.reinit(relevant_set, MPI_COMM_WORLD); - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, 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 828623a90d..08a2dfe710 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -204,7 +204,7 @@ test() x_rel.reinit(relevant_set, MPI_COMM_WORLD); - AffineConstraints cm(relevant_set); + AffineConstraints cm(owned_set, 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 f9f653c004..4edc7d8dc3 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -68,7 +68,8 @@ test() // build constraint matrix const IndexSet locally_relevant = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(locally_relevant); + AffineConstraints constraints(dof.locally_owned_dofs(), + 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 f61eeecc40..12b0db0c91 100644 --- a/tests/mpi/parallel_block_vector_05.cc +++ b/tests/mpi/parallel_block_vector_05.cc @@ -89,7 +89,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 84fed2e3cc..9976cbab86 100644 --- a/tests/mpi/parallel_block_vector_06.cc +++ b/tests/mpi/parallel_block_vector_06.cc @@ -91,7 +91,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 e348579761..0b01b60c55 100644 --- a/tests/mpi/parallel_block_vector_07.cc +++ b/tests/mpi/parallel_block_vector_07.cc @@ -89,7 +89,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 1a9f019990..cb2f44df39 100644 --- a/tests/mpi/parallel_block_vector_08.cc +++ b/tests/mpi/parallel_block_vector_08.cc @@ -89,7 +89,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 28f04172a2..12104c5036 100644 --- a/tests/mpi/parallel_block_vector_09.cc +++ b/tests/mpi/parallel_block_vector_09.cc @@ -92,7 +92,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 d0ab5186d1..3f5421dbae 100644 --- a/tests/mpi/parallel_block_vector_10.cc +++ b/tests/mpi/parallel_block_vector_10.cc @@ -88,7 +88,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 fbbe696674..5ed50a9113 100644 --- a/tests/mpi/parallel_block_vector_11.cc +++ b/tests/mpi/parallel_block_vector_11.cc @@ -90,7 +90,7 @@ test(const unsigned int n_blocks = 5) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, 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 16222bdd9b..9d2855facf 100644 --- a/tests/mpi/parallel_block_vector_12.cc +++ b/tests/mpi/parallel_block_vector_12.cc @@ -90,7 +90,7 @@ test(const unsigned int n = 5, const unsigned int m = 3) const IndexSet &owned_set = dof.locally_owned_dofs(); const IndexSet relevant_set = DoFTools::extract_locally_relevant_dofs(dof); - AffineConstraints constraints(relevant_set); + AffineConstraints constraints(owned_set, relevant_set); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, 0, diff --git a/tests/mpi/periodicity_01.cc b/tests/mpi/periodicity_01.cc index 8ef91fab05..dfcad39cd1 100644 --- a/tests/mpi/periodicity_01.cc +++ b/tests/mpi/periodicity_01.cc @@ -150,7 +150,7 @@ namespace Step40 // Periodic Conditions constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); for (int i = 1; i < dim; ++i) DoFTools::make_periodicity_constraints(dof_handler, diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc index f2900e1060..dfc3eebcce 100644 --- a/tests/mpi/periodicity_02.cc +++ b/tests/mpi/periodicity_02.cc @@ -340,7 +340,7 @@ namespace Step22 locally_relevant_dofs.get_view(n_u, n_u + n_p)); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); const FEValuesExtractors::Vector velocities(0); const FEValuesExtractors::Scalar pressure(dim); diff --git a/tests/mpi/periodicity_03.cc b/tests/mpi/periodicity_03.cc index 97145887fd..cbcf7d1a6d 100644 --- a/tests/mpi/periodicity_03.cc +++ b/tests/mpi/periodicity_03.cc @@ -267,7 +267,7 @@ namespace Step22 locally_relevant_dofs.get_view(n_u, n_u + n_p)); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); const FEValuesExtractors::Vector velocities(0); const FEValuesExtractors::Scalar pressure(dim); diff --git a/tests/mpi/periodicity_04.cc b/tests/mpi/periodicity_04.cc index 521844b066..2115cfdc97 100644 --- a/tests/mpi/periodicity_04.cc +++ b/tests/mpi/periodicity_04.cc @@ -188,7 +188,7 @@ check(const unsigned int orientation, bool reverse) const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); { std::vector< GridTools::PeriodicFacePair::cell_iterator>> diff --git a/tests/mpi/periodicity_06.cc b/tests/mpi/periodicity_06.cc index 7c853c416b..2b1c9056a2 100644 --- a/tests/mpi/periodicity_06.cc +++ b/tests/mpi/periodicity_06.cc @@ -170,7 +170,7 @@ test(const unsigned numRefinementLevels = 2) /// creating combined hanging node and periodic constraint matrix AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); std::vector< GridTools::PeriodicFacePair::cell_iterator>> diff --git a/tests/mpi/periodicity_07.cc b/tests/mpi/periodicity_07.cc index 58b9c0e1c9..66e68dee4e 100644 --- a/tests/mpi/periodicity_07.cc +++ b/tests/mpi/periodicity_07.cc @@ -148,7 +148,7 @@ test(const unsigned numRefinementLevels = 2) /// creating combined hanging node and periodic constraint matrix AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); std::vector< GridTools::PeriodicFacePair::cell_iterator>> diff --git a/tests/mpi/periodicity_08.cc b/tests/mpi/periodicity_08.cc index 80e0acfc06..58cf4fbe6d 100644 --- a/tests/mpi/periodicity_08.cc +++ b/tests/mpi/periodicity_08.cc @@ -142,7 +142,7 @@ test() /// creating combined hanging node and periodic constraint matrix AffineConstraints constraints; constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); for (int d = 0; d < dim; ++d) DoFTools::make_periodicity_constraints( diff --git a/tests/mpi/petsc_distribute_01.cc b/tests/mpi/petsc_distribute_01.cc index fffc5c50c5..da2e155748 100644 --- a/tests/mpi/petsc_distribute_01.cc +++ b/tests/mpi/petsc_distribute_01.cc @@ -66,7 +66,8 @@ test() std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(vec.locally_owned_elements(), + 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/petsc_distribute_01_inhomogeneous.cc b/tests/mpi/petsc_distribute_01_inhomogeneous.cc index 849762b943..231d1a5a6f 100644 --- a/tests/mpi/petsc_distribute_01_inhomogeneous.cc +++ b/tests/mpi/petsc_distribute_01_inhomogeneous.cc @@ -58,7 +58,8 @@ test() std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(vec.locally_owned_elements(), + 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/petsc_step-27.cc b/tests/mpi/petsc_step-27.cc index 7fef9f96dc..c9571e51b4 100644 --- a/tests/mpi/petsc_step-27.cc +++ b/tests/mpi/petsc_step-27.cc @@ -216,7 +216,7 @@ namespace Step27 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/project_bv_div_conf.cc b/tests/mpi/project_bv_div_conf.cc index 1401735150..e2f9cff9cc 100644 --- a/tests/mpi/project_bv_div_conf.cc +++ b/tests/mpi/project_bv_div_conf.cc @@ -197,7 +197,8 @@ namespace ResFlow << std::endl; { - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); const FEValuesExtractors::Vector velocities(0); DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/mpi/step-37.cc b/tests/mpi/step-37.cc index cbe105a7c9..4bc0513ee0 100644 --- a/tests/mpi/step-37.cc +++ b/tests/mpi/step-37.cc @@ -216,7 +216,7 @@ namespace Step37 DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, @@ -258,7 +258,8 @@ namespace Step37 const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); @@ -322,8 +323,10 @@ namespace Step37 non_homogeneous_constraints.clear(); { AffineConstraints hanging_nodes_laplace_constraints; - hanging_nodes_laplace_constraints.reinit(locally_relevant_dofs); - non_homogeneous_constraints.reinit(locally_relevant_dofs); + hanging_nodes_laplace_constraints.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); + non_homogeneous_constraints.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints( dof_handler, hanging_nodes_laplace_constraints); diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc index 0ef74d70dc..2c1db7ab07 100644 --- a/tests/mpi/step-40.cc +++ b/tests/mpi/step-40.cc @@ -140,7 +140,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/step-40_cuthill_mckee.cc b/tests/mpi/step-40_cuthill_mckee.cc index 4d3c4540db..642b2cfaa5 100644 --- a/tests/mpi/step-40_cuthill_mckee.cc +++ b/tests/mpi/step-40_cuthill_mckee.cc @@ -202,7 +202,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc b/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc index e77ecfbcf6..46f9006da9 100644 --- a/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc +++ b/tests/mpi/step-40_cuthill_mckee_MPI-subset.cc @@ -203,7 +203,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc index bef1f12ee1..3a692f897c 100644 --- a/tests/mpi/step-40_direct_solver.cc +++ b/tests/mpi/step-40_direct_solver.cc @@ -140,7 +140,7 @@ namespace Step40 system_rhs = PetscScalar(); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/mpi/trilinos_distribute_01.cc b/tests/mpi/trilinos_distribute_01.cc index 4a689bb7d7..90cd9d463b 100644 --- a/tests/mpi/trilinos_distribute_01.cc +++ b/tests/mpi/trilinos_distribute_01.cc @@ -71,7 +71,8 @@ test() std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(vec.locally_owned_elements(), + 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_inhomogeneous.cc b/tests/mpi/trilinos_distribute_01_inhomogeneous.cc index 53afe910d0..3f7978cd69 100644 --- a/tests/mpi/trilinos_distribute_01_inhomogeneous.cc +++ b/tests/mpi/trilinos_distribute_01_inhomogeneous.cc @@ -63,7 +63,8 @@ test() std::max(100 * myid - 50, 0), std::min(static_cast(100 * myid + 150), vec.size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(vec.locally_owned_elements(), + 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_04.cc b/tests/mpi/trilinos_distribute_04.cc index 18e6264cbc..926b5ab4ec 100644 --- a/tests/mpi/trilinos_distribute_04.cc +++ b/tests/mpi/trilinos_distribute_04.cc @@ -91,7 +91,7 @@ test() DoFTools::extract_locally_relevant_dofs(dofh); AffineConstraints cm; - cm.reinit(locally_relevant_set); + cm.reinit(dofh.locally_owned_dofs(), locally_relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); std::map *> dirichlet_boundary; diff --git a/tests/mpi/trilinos_step-27.cc b/tests/mpi/trilinos_step-27.cc index 70f54e8e2a..87f9c3efab 100644 --- a/tests/mpi/trilinos_step-27.cc +++ b/tests/mpi/trilinos_step-27.cc @@ -220,7 +220,7 @@ namespace Step27 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/multigrid-global-coarsening/events_non_nested.cc b/tests/multigrid-global-coarsening/events_non_nested.cc index ed47e797ee..d1515096d6 100644 --- a/tests/multigrid-global-coarsening/events_non_nested.cc +++ b/tests/multigrid-global-coarsening/events_non_nested.cc @@ -89,7 +89,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); constraint.close(); diff --git a/tests/multigrid-global-coarsening/interpolate_to_mg.cc b/tests/multigrid-global-coarsening/interpolate_to_mg.cc index febc6bcb41..de6bc7fe68 100644 --- a/tests/multigrid-global-coarsening/interpolate_to_mg.cc +++ b/tests/multigrid-global-coarsening/interpolate_to_mg.cc @@ -131,7 +131,7 @@ test(const unsigned int n_glob_ref = 2, const unsigned int n_ref = 0) // constraints: AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/multigrid-global-coarsening/interpolate_to_mg_01.cc b/tests/multigrid-global-coarsening/interpolate_to_mg_01.cc index c13e8fae2d..542b2f6d90 100644 --- a/tests/multigrid-global-coarsening/interpolate_to_mg_01.cc +++ b/tests/multigrid-global-coarsening/interpolate_to_mg_01.cc @@ -85,7 +85,7 @@ test() DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); std::vector< diff --git a/tests/multigrid-global-coarsening/multigrid_a_01.cc b/tests/multigrid-global-coarsening/multigrid_a_01.cc index b8b8991feb..b69ac00a28 100644 --- a/tests/multigrid-global-coarsening/multigrid_a_01.cc +++ b/tests/multigrid-global-coarsening/multigrid_a_01.cc @@ -83,7 +83,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); constraint.close(); diff --git a/tests/multigrid-global-coarsening/multigrid_a_02.cc b/tests/multigrid-global-coarsening/multigrid_a_02.cc index 695a486506..dac418b83b 100644 --- a/tests/multigrid-global-coarsening/multigrid_a_02.cc +++ b/tests/multigrid-global-coarsening/multigrid_a_02.cc @@ -68,7 +68,7 @@ test(const unsigned int n_refinements, const unsigned int fe_degree_fine) // set up constraints const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, l); - constraint.reinit(relevant_dofs); + constraint.reinit(dof_handler.locally_owned_mg_dofs(l), relevant_dofs); constraint.add_lines(mg_constrained_dofs.get_boundary_indices(l)); constraint.close(); diff --git a/tests/multigrid-global-coarsening/multigrid_a_03.cc b/tests/multigrid-global-coarsening/multigrid_a_03.cc index 4d749aa1a8..90daf33d47 100644 --- a/tests/multigrid-global-coarsening/multigrid_a_03.cc +++ b/tests/multigrid-global-coarsening/multigrid_a_03.cc @@ -66,7 +66,7 @@ test(const unsigned int n_refinements, const unsigned int fe_degree_fine) // set up constraints const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, l); - constraint.reinit(relevant_dofs); + constraint.reinit(dof_handler.locally_owned_mg_dofs(l), relevant_dofs); constraint.add_lines(mg_constrained_dofs.get_boundary_indices(l)); constraint.close(); diff --git a/tests/multigrid-global-coarsening/multigrid_p_01.cc b/tests/multigrid-global-coarsening/multigrid_p_01.cc index 6a67d91158..22cea00ec0 100644 --- a/tests/multigrid-global-coarsening/multigrid_p_01.cc +++ b/tests/multigrid-global-coarsening/multigrid_p_01.cc @@ -110,7 +110,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); DoFTools::make_hanging_node_constraints(dof_handler, constraint); diff --git a/tests/multigrid-global-coarsening/multigrid_p_02.cc b/tests/multigrid-global-coarsening/multigrid_p_02.cc index 3ee24f6575..b0408f9ea1 100644 --- a/tests/multigrid-global-coarsening/multigrid_p_02.cc +++ b/tests/multigrid-global-coarsening/multigrid_p_02.cc @@ -80,7 +80,7 @@ test(const unsigned int n_refinements, const unsigned int fe_degree_fine) const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, 0 /*level*/); - constraint.reinit(relevant_dofs); + constraint.reinit(dof_handler.locally_owned_mg_dofs(0), relevant_dofs); constraint.add_lines( mg_constrained_dofs.get_boundary_indices(0 /*level*/)); constraint.close(); diff --git a/tests/multigrid-global-coarsening/multigrid_p_03.cc b/tests/multigrid-global-coarsening/multigrid_p_03.cc index daa1a3260c..e377c8b4c9 100644 --- a/tests/multigrid-global-coarsening/multigrid_p_03.cc +++ b/tests/multigrid-global-coarsening/multigrid_p_03.cc @@ -83,7 +83,8 @@ test(const unsigned int n_refinements, const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraint.reinit(relevant_dofs); + constraint.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); constraint.add_lines(mg_constrained_dofs.get_boundary_indices(level)); constraint.close(); diff --git a/tests/multigrid-global-coarsening/multigrid_p_04.cc b/tests/multigrid-global-coarsening/multigrid_p_04.cc index 47400165f7..f4422a0466 100644 --- a/tests/multigrid-global-coarsening/multigrid_p_04.cc +++ b/tests/multigrid-global-coarsening/multigrid_p_04.cc @@ -87,7 +87,8 @@ test(const unsigned int n_refinements, AffineConstraints fine_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(fine_dof_handler); - fine_constraints.reinit(locally_relevant_dofs); + fine_constraints.reinit(fine_dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values(*mapping, fine_dof_handler, 0, @@ -152,7 +153,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); DoFTools::make_hanging_node_constraints(dof_handler, constraint); diff --git a/tests/multigrid-global-coarsening/non_nested_multigrid_01.cc b/tests/multigrid-global-coarsening/non_nested_multigrid_01.cc index 15b19a3edb..dce4eb94b4 100644 --- a/tests/multigrid-global-coarsening/non_nested_multigrid_01.cc +++ b/tests/multigrid-global-coarsening/non_nested_multigrid_01.cc @@ -83,7 +83,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); constraint.close(); diff --git a/tests/multigrid-global-coarsening/non_nested_multigrid_02.cc b/tests/multigrid-global-coarsening/non_nested_multigrid_02.cc index 4d64b9f276..11bfdcfa35 100644 --- a/tests/multigrid-global-coarsening/non_nested_multigrid_02.cc +++ b/tests/multigrid-global-coarsening/non_nested_multigrid_02.cc @@ -74,7 +74,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *_mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); constraint.close(); diff --git a/tests/multigrid-global-coarsening/non_nested_multigrid_03.cc b/tests/multigrid-global-coarsening/non_nested_multigrid_03.cc index 89d39e081a..6cd9ce42db 100644 --- a/tests/multigrid-global-coarsening/non_nested_multigrid_03.cc +++ b/tests/multigrid-global-coarsening/non_nested_multigrid_03.cc @@ -65,7 +65,8 @@ test(const unsigned int n_refinements, const unsigned int fe_degree_fine) // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); constraint.close(); diff --git a/tests/multigrid-global-coarsening/non_nested_multigrid_04.cc b/tests/multigrid-global-coarsening/non_nested_multigrid_04.cc index bf28c8f8ee..99199e696d 100644 --- a/tests/multigrid-global-coarsening/non_nested_multigrid_04.cc +++ b/tests/multigrid-global-coarsening/non_nested_multigrid_04.cc @@ -140,7 +140,8 @@ test(const unsigned int n_refinements, // set up constraints const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraint.reinit(locally_relevant_dofs); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values( *mapping, dof_handler, 0, Functions::ZeroFunction(), constraint); DoFTools::make_hanging_node_constraints(dof_handler, constraint); diff --git a/tests/multigrid-global-coarsening/non_nested_multigrid_05.cc b/tests/multigrid-global-coarsening/non_nested_multigrid_05.cc index 45660a5963..3616c68bd1 100644 --- a/tests/multigrid-global-coarsening/non_nested_multigrid_05.cc +++ b/tests/multigrid-global-coarsening/non_nested_multigrid_05.cc @@ -79,10 +79,10 @@ test(const unsigned int n_refinements, dof_handler.distribute_dofs(*fe); // set up constraints - IndexSet locally_relevant_dofs; - DoFTools::extract_locally_relevant_dofs(dof_handler, - locally_relevant_dofs); - constraint.reinit(locally_relevant_dofs); + const IndexSet locally_relevant_dofs = + DoFTools::extract_locally_relevant_dofs(dof_handler); + constraint.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); VectorTools::interpolate_boundary_values(*_mapping, dof_handler, 0, diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_02.cc b/tests/multigrid-global-coarsening/parallel_multigrid_02.cc index a87e4ba29f..eb82a745a7 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_02.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_02.cc @@ -107,7 +107,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -174,7 +174,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_01.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_01.cc index 10e6ba46c1..84a5be6cd0 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_01.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_01.cc @@ -79,7 +79,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -87,9 +87,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -98,8 +100,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -478,7 +478,8 @@ do_test(const DoFHandler &dof) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_02.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_02.cc index fa2f36cf9a..e27c3e23c9 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_02.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_02.cc @@ -108,7 +108,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -153,7 +153,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -188,7 +189,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_03.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_03.cc index 9fbff8713a..dba6722a67 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_03.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_03.cc @@ -86,7 +86,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -94,9 +94,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -105,8 +107,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -482,7 +482,8 @@ do_test(const DoFHandler &dof, const bool threaded) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_04.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_04.cc index 4d3d0e684f..28995351bd 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_04.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_04.cc @@ -108,7 +108,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -153,7 +153,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -188,7 +189,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_05.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_05.cc index b3d63db9f0..7629f63fd8 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_05.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_05.cc @@ -83,7 +83,7 @@ public: { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, dirichlet_boundary, @@ -91,9 +91,11 @@ public: } else { + const IndexSet &locally_owned = + dof_handler.locally_owned_mg_dofs(level); const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); - constraints.reinit(relevant_dofs); + constraints.reinit(locally_owned, relevant_dofs); constraints.add_lines(mg_constrained_dofs.get_boundary_indices(level)); const std::vector interface_indices = @@ -102,8 +104,6 @@ public: edge_constrained_indices.clear(); edge_constrained_indices.reserve(interface_indices.size()); edge_constrained_values.resize(interface_indices.size()); - const IndexSet &locally_owned = - dof_handler.locally_owned_mg_dofs(level); for (unsigned int i = 0; i < interface_indices.size(); ++i) if (locally_owned.is_element(interface_indices[i])) edge_constrained_indices.push_back( @@ -479,7 +479,8 @@ do_test(const DoFHandler &dof, const bool threaded) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06.cc index c5c587d526..7be148f050 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06.cc @@ -230,7 +230,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -279,7 +279,8 @@ do_test(const DoFHandler &dof, const unsigned int nb) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -316,7 +317,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06ref.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06ref.cc index 5ab2255091..c1726e71df 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06ref.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_06ref.cc @@ -109,7 +109,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -154,7 +154,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -189,7 +190,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_07.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_07.cc index 158fa98d31..23c02f6f51 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_07.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_07.cc @@ -252,7 +252,8 @@ do_test(const std::vector *> &dof) std::vector *> constraints_ptrs(dof.size()); for (unsigned int i = 0; i < dof.size(); ++i) { - constraints[i].reinit(locally_relevant_dofs[i]); + constraints[i].reinit(dof[i]->locally_owned_dofs(), + locally_relevant_dofs[i]); DoFTools::make_hanging_node_constraints(*dof[i], constraints[i]); VectorTools::interpolate_boundary_values(*dof[i], dirichlet_boundary, @@ -301,7 +302,8 @@ do_test(const std::vector *> &dof) // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs[b]); + hanging_node_constraints.reinit(dof[b]->locally_owned_dofs(), + locally_relevant_dofs[b]); DoFTools::make_hanging_node_constraints(*dof[b], hanging_node_constraints); hanging_node_constraints.close(); @@ -350,7 +352,8 @@ do_test(const std::vector *> &dof) { const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(*dof[i], level); - level_constraints[i].reinit(relevant_dofs); + level_constraints[i].reinit(dof[i]->locally_owned_mg_dofs(level), + relevant_dofs); level_constraints[i].add_lines( mg_constrained_dofs[i].get_boundary_indices(level)); level_constraints[i].close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_08.cc b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_08.cc index 0f5a8cdccd..85392507e6 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_08.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_adaptive_08.cc @@ -226,7 +226,7 @@ do_test(const DoFHandler &dof) // fine-level constraints AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, constraints); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, @@ -266,7 +266,8 @@ do_test(const DoFHandler &dof) { // this is to make it consistent with parallel_multigrid_adaptive.cc AffineConstraints hanging_node_constraints; - hanging_node_constraints.reinit(locally_relevant_dofs); + hanging_node_constraints.reinit(dof.locally_owned_dofs(), + locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); @@ -296,7 +297,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/parallel_multigrid_mf_02.cc b/tests/multigrid-global-coarsening/parallel_multigrid_mf_02.cc index 010c4cff2c..0496444b4e 100644 --- a/tests/multigrid-global-coarsening/parallel_multigrid_mf_02.cc +++ b/tests/multigrid-global-coarsening/parallel_multigrid_mf_02.cc @@ -107,7 +107,7 @@ do_test(const DoFHandler &dof) const IndexSet locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof.locally_owned_dofs(), locally_relevant_dofs); VectorTools::interpolate_boundary_values(dof, dirichlet_boundary, constraints); @@ -161,7 +161,7 @@ do_test(const DoFHandler &dof) AffineConstraints level_constraints; const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof, level); - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof.locally_owned_mg_dofs(level), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/step-37-inhomogeneous-1.cc b/tests/multigrid-global-coarsening/step-37-inhomogeneous-1.cc index 12432f18f4..7cdd947eaf 100644 --- a/tests/multigrid-global-coarsening/step-37-inhomogeneous-1.cc +++ b/tests/multigrid-global-coarsening/step-37-inhomogeneous-1.cc @@ -402,7 +402,7 @@ namespace Step37 DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, @@ -444,7 +444,8 @@ namespace Step37 const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/multigrid-global-coarsening/stokes_computation.cc b/tests/multigrid-global-coarsening/stokes_computation.cc index ea9d2f5038..e095b4a1d7 100644 --- a/tests/multigrid-global-coarsening/stokes_computation.cc +++ b/tests/multigrid-global-coarsening/stokes_computation.cc @@ -1040,7 +1040,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u.reinit(locally_relevant_dofs_u); + constraints_u.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u); VectorTools::interpolate_boundary_values( @@ -1049,7 +1050,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_p = DoFTools::extract_locally_relevant_dofs(dof_handler_p); - constraints_p.reinit(locally_relevant_dofs_p); + constraints_p.reinit(dof_handler_p.locally_owned_dofs(), + locally_relevant_dofs_p); DoFTools::make_hanging_node_constraints(dof_handler_p, constraints_p); constraints_p.close(); @@ -1116,7 +1118,8 @@ namespace StokesClass const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler_u, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler_u.locally_owned_mg_dofs(level), + relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); @@ -1171,7 +1174,8 @@ namespace StokesClass AffineConstraints constraints_u_no_dirchlet; const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u_no_dirchlet.reinit(locally_relevant_dofs_u); + constraints_u_no_dirchlet.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u_no_dirchlet); constraints_u_no_dirchlet.close(); diff --git a/tests/multigrid/constrained_dofs_01.cc b/tests/multigrid/constrained_dofs_01.cc index dce5d4f1ea..ae6431dd9f 100644 --- a/tests/multigrid/constrained_dofs_01.cc +++ b/tests/multigrid/constrained_dofs_01.cc @@ -185,7 +185,8 @@ check_fe(FiniteElement &fe) const IndexSet relevant = DoFTools::extract_locally_relevant_level_dofs(dofh, level); - mg_boundary_constraints[level].reinit(relevant); + mg_boundary_constraints[level].reinit(dofh.locally_owned_mg_dofs(level), + relevant); mg_boundary_constraints[level].add_lines(boundary_indices[level]); mg_constrained_dofs_1.add_boundary_indices(dofh, diff --git a/tests/multigrid/constrained_dofs_07.cc b/tests/multigrid/constrained_dofs_07.cc index d4a8012122..6b8c582e47 100644 --- a/tests/multigrid/constrained_dofs_07.cc +++ b/tests/multigrid/constrained_dofs_07.cc @@ -55,7 +55,8 @@ check() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(mgdof, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(mgdof.locally_owned_mg_dofs(level), + relevant_dofs); typename DoFHandler::level_face_iterator face0 = mgdof.begin(level)->face(0); diff --git a/tests/multigrid/events_01.cc b/tests/multigrid/events_01.cc index 9cf68327b0..fa8f8b89e5 100644 --- a/tests/multigrid/events_01.cc +++ b/tests/multigrid/events_01.cc @@ -148,7 +148,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -282,7 +283,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); boundary_constraints[level].add_lines( mg_constrained_dofs.get_refinement_edge_indices(level)); boundary_constraints[level].add_lines( diff --git a/tests/multigrid/interface_matrix_entry_01.cc b/tests/multigrid/interface_matrix_entry_01.cc index a563bcda8c..c2076d4776 100644 --- a/tests/multigrid/interface_matrix_entry_01.cc +++ b/tests/multigrid/interface_matrix_entry_01.cc @@ -91,7 +91,7 @@ test() const IndexSet locally_relevant_set = DoFTools::extract_locally_relevant_dofs(mg_dof_handler); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); const std::set dirichlet_boundary_ids = {0}; diff --git a/tests/multigrid/interpolate_to_mg_01.cc b/tests/multigrid/interpolate_to_mg_01.cc index 953382ced2..746c70ba33 100644 --- a/tests/multigrid/interpolate_to_mg_01.cc +++ b/tests/multigrid/interpolate_to_mg_01.cc @@ -85,7 +85,7 @@ test() DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); std::vector< diff --git a/tests/multigrid/mg_coarse_01.cc b/tests/multigrid/mg_coarse_01.cc index 0224000798..aedebd1e98 100644 --- a/tests/multigrid/mg_coarse_01.cc +++ b/tests/multigrid/mg_coarse_01.cc @@ -205,7 +205,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -349,7 +350,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); boundary_constraints[level].add_lines( mg_constrained_dofs.get_refinement_edge_indices(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 618e511cbe..77223a3ec8 100644 --- a/tests/multigrid/step-16-50-mpi-linear-operator.cc +++ b/tests/multigrid/step-16-50-mpi-linear-operator.cc @@ -199,7 +199,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -348,7 +349,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); for (const types::global_dof_index dof_index : mg_constrained_dofs.get_refinement_edge_indices(level)) diff --git a/tests/multigrid/step-16-50-mpi-smoother.cc b/tests/multigrid/step-16-50-mpi-smoother.cc index 6c3c688d60..1347c5019e 100644 --- a/tests/multigrid/step-16-50-mpi-smoother.cc +++ b/tests/multigrid/step-16-50-mpi-smoother.cc @@ -199,7 +199,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -347,7 +348,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); for (const types::global_dof_index dof_index : mg_constrained_dofs.get_refinement_edge_indices(level)) diff --git a/tests/multigrid/step-16-50-mpi.cc b/tests/multigrid/step-16-50-mpi.cc index 61a2dc0213..45e70401b4 100644 --- a/tests/multigrid/step-16-50-mpi.cc +++ b/tests/multigrid/step-16-50-mpi.cc @@ -199,7 +199,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -348,7 +349,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); for (const types::global_dof_index dof_index : mg_constrained_dofs.get_refinement_edge_indices(level)) boundary_constraints[level].constrain_dof_to_zero(dof_index); diff --git a/tests/multigrid/step-50_01.cc b/tests/multigrid/step-50_01.cc index 56338239fa..3b45c23071 100644 --- a/tests/multigrid/step-50_01.cc +++ b/tests/multigrid/step-50_01.cc @@ -202,7 +202,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); std::map *> dirichlet_boundary; @@ -346,7 +347,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); boundary_constraints[level].add_lines( mg_constrained_dofs.get_refinement_edge_indices(level)); boundary_constraints[level].add_lines( diff --git a/tests/multigrid/step-50_02.cc b/tests/multigrid/step-50_02.cc index 710b3ad30a..47b9701022 100644 --- a/tests/multigrid/step-50_02.cc +++ b/tests/multigrid/step-50_02.cc @@ -203,7 +203,8 @@ namespace Step50 solution.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); system_rhs.reinit(mg_dof_handler.locally_owned_dofs(), MPI_COMM_WORLD); - constraints.reinit(locally_relevant_set); + constraints.reinit(mg_dof_handler.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); const std::set dirichlet_boundary_ids = {0}; @@ -354,7 +355,8 @@ namespace Step50 { const IndexSet dofset = DoFTools::extract_locally_relevant_level_dofs(mg_dof_handler, level); - boundary_constraints[level].reinit(dofset); + boundary_constraints[level].reinit( + mg_dof_handler.locally_owned_mg_dofs(level), dofset); boundary_constraints[level].add_lines( mg_constrained_dofs.get_refinement_edge_indices(level)); boundary_constraints[level].add_lines( diff --git a/tests/multigrid/transfer_04.cc b/tests/multigrid/transfer_04.cc index e39defb95e..d131b47a7d 100644 --- a/tests/multigrid/transfer_04.cc +++ b/tests/multigrid/transfer_04.cc @@ -130,7 +130,8 @@ check_fe(FiniteElement &fe) AffineConstraints hanging_node_constraints; const IndexSet locally_relevant_set = DoFTools::extract_locally_relevant_dofs(dofh); - hanging_node_constraints.reinit(locally_relevant_set); + hanging_node_constraints.reinit(dofh.locally_owned_dofs(), + locally_relevant_set); DoFTools::make_hanging_node_constraints(dofh, hanging_node_constraints); hanging_node_constraints.close(); diff --git a/tests/multigrid/transfer_matrix_free_13.cc b/tests/multigrid/transfer_matrix_free_13.cc index d6fd593072..85e561c98b 100644 --- a/tests/multigrid/transfer_matrix_free_13.cc +++ b/tests/multigrid/transfer_matrix_free_13.cc @@ -54,7 +54,7 @@ check() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(mgdof, 0); AffineConstraints user_constraints; - user_constraints.reinit(relevant_dofs); + user_constraints.reinit(mgdof.locally_owned_mg_dofs(0), relevant_dofs); typename DoFHandler::level_face_iterator face0 = mgdof.begin(0)->face(0); std::vector face_dofs(fe.dofs_per_face); diff --git a/tests/multigrid/transfer_prebuilt_05.cc b/tests/multigrid/transfer_prebuilt_05.cc index dd79ecc498..2a38bca582 100644 --- a/tests/multigrid/transfer_prebuilt_05.cc +++ b/tests/multigrid/transfer_prebuilt_05.cc @@ -51,7 +51,7 @@ check() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(mgdof, 0); AffineConstraints user_constraints; - user_constraints.reinit(relevant_dofs); + user_constraints.reinit(mgdof.locally_owned_mg_dofs(0), relevant_dofs); typename DoFHandler::level_face_iterator face0 = mgdof.begin(0)->face(0); std::vector face_dofs(fe.dofs_per_face); diff --git a/tests/non_matching/step-70.cc b/tests/non_matching/step-70.cc index de1d8bb5e7..e39de8c2d1 100644 --- a/tests/non_matching/step-70.cc +++ b/tests/non_matching/step-70.cc @@ -1247,7 +1247,7 @@ namespace Step70 fluid_relevant_dofs[1] = locally_relevant_dofs.get_view(n_u, n_u + n_p); { - constraints.reinit(locally_relevant_dofs); + constraints.reinit(fluid_dh.locally_owned_dofs(), locally_relevant_dofs); const FEValuesExtractors::Vector velocities(0); DoFTools::make_hanging_node_constraints(fluid_dh, constraints); diff --git a/tests/numerics/no_flux_18.cc b/tests/numerics/no_flux_18.cc index bfad4b552b..f62a4ec9ba 100644 --- a/tests/numerics/no_flux_18.cc +++ b/tests/numerics/no_flux_18.cc @@ -1042,7 +1042,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u.reinit(locally_relevant_dofs_u); + constraints_u.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u); // VectorTools::interpolate_boundary_values( @@ -1058,7 +1059,8 @@ namespace StokesClass const IndexSet locally_relevant_dofs_p = DoFTools::extract_locally_relevant_dofs(dof_handler_p); - constraints_p.reinit(locally_relevant_dofs_p); + constraints_p.reinit(dof_handler_p.locally_owned_dofs(), + locally_relevant_dofs_p); DoFTools::make_hanging_node_constraints(dof_handler_p, constraints_p); constraints_p.close(); @@ -1125,7 +1127,8 @@ namespace StokesClass const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler_u, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler_u.locally_owned_mg_dofs(level), + relevant_dofs); // level_constraints.add_lines( // mg_constrained_dofs.get_boundary_indices(level)); @@ -1198,7 +1201,8 @@ namespace StokesClass AffineConstraints constraints_u_no_dirchlet; const IndexSet locally_relevant_dofs_u = DoFTools::extract_locally_relevant_dofs(dof_handler_u); - constraints_u_no_dirchlet.reinit(locally_relevant_dofs_u); + constraints_u_no_dirchlet.reinit(dof_handler_u.locally_owned_dofs(), + locally_relevant_dofs_u); DoFTools::make_hanging_node_constraints(dof_handler_u, constraints_u_no_dirchlet); constraints_u_no_dirchlet.close(); diff --git a/tests/numerics/nonlinear_solver_selector_03.cc b/tests/numerics/nonlinear_solver_selector_03.cc index 940f980da9..f6873a6e3e 100644 --- a/tests/numerics/nonlinear_solver_selector_03.cc +++ b/tests/numerics/nonlinear_solver_selector_03.cc @@ -170,7 +170,7 @@ namespace MPI_nonlinear_solver_selector_test { nonzero_constraints.clear(); - nonzero_constraints.reinit(locally_relevant_dofs); + nonzero_constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, nonzero_constraints); @@ -192,7 +192,7 @@ namespace MPI_nonlinear_solver_selector_test { zero_constraints.clear(); - zero_constraints.reinit(locally_relevant_dofs); + zero_constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, zero_constraints); VectorTools::interpolate_boundary_values( diff --git a/tests/numerics/project_parallel_common.h b/tests/numerics/project_parallel_common.h index 06dc39f2da..4171035649 100644 --- a/tests/numerics/project_parallel_common.h +++ b/tests/numerics/project_parallel_common.h @@ -118,7 +118,7 @@ do_project(const parallel::distributed::Triangulation &triangulation, DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, 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 5d53c945ea..e77ffff0ae 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, DoFTools::extract_locally_relevant_dofs(dof_handler); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), 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 e9d650b934..11b52656aa 100644 --- a/tests/numerics/project_parallel_qpmf_common.h +++ b/tests/numerics/project_parallel_qpmf_common.h @@ -126,7 +126,8 @@ do_project(const parallel::distributed::Triangulation &triangulation, locally_relevant_dofs[i] = DoFTools::extract_locally_relevant_dofs(*dof_handlers[i]); - constraints[i].reinit(locally_relevant_dofs[i]); + constraints[i].reinit(dof_handlers[i]->locally_owned_dofs(), + locally_relevant_dofs[i]); DoFTools::make_hanging_node_constraints(*dof_handlers[i], constraints[i]); constraints[i].close(); diff --git a/tests/performance/timing_mg_glob_coarsen.cc b/tests/performance/timing_mg_glob_coarsen.cc index cc6313a7aa..dd994254b0 100644 --- a/tests/performance/timing_mg_glob_coarsen.cc +++ b/tests/performance/timing_mg_glob_coarsen.cc @@ -504,7 +504,7 @@ LaplaceProblem::setup_dofs() IndexSet relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_h); AffineConstraints &constraints = level_constraints[level]; - constraints.reinit(relevant_dofs); + constraints.reinit(dof_h.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_h, constraints); constraints.close(); typename MatrixFree::AdditionalData additional_data; @@ -518,7 +518,7 @@ LaplaceProblem::setup_dofs() // now create the final constraints object relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_h); constraints.clear(); - constraints.reinit(relevant_dofs); + constraints.reinit(dof_h.locally_owned_dofs(), relevant_dofs); DoFTools::make_hanging_node_constraints(dof_h, constraints); constraints.close(); } diff --git a/tests/performance/timing_step_37.cc b/tests/performance/timing_step_37.cc index d79b605f9f..d52651bf2c 100644 --- a/tests/performance/timing_step_37.cc +++ b/tests/performance/timing_step_37.cc @@ -372,7 +372,7 @@ LaplaceProblem::setup_dofs() DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values( mapping, dof_handler, 0, Functions::ZeroFunction(), constraints); @@ -393,7 +393,7 @@ LaplaceProblem::setup_dofs() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); @@ -442,7 +442,7 @@ LaplaceProblem::setup_matrix_free() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/performance/timing_step_37_gc.cc b/tests/performance/timing_step_37_gc.cc index f4dd71b587..6f139ff2a2 100644 --- a/tests/performance/timing_step_37_gc.cc +++ b/tests/performance/timing_step_37_gc.cc @@ -372,7 +372,7 @@ LaplaceProblem::setup_dofs() DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values( mapping, dof_handler, 0, Functions::ZeroFunction(), constraints); @@ -393,7 +393,7 @@ LaplaceProblem::setup_dofs() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); @@ -442,7 +442,7 @@ LaplaceProblem::setup_matrix_free() const IndexSet relevant_dofs = DoFTools::extract_locally_relevant_level_dofs(dof_handler, level); AffineConstraints level_constraints; - level_constraints.reinit(relevant_dofs); + level_constraints.reinit(dof_handler.locally_owned_dofs(), relevant_dofs); level_constraints.add_lines( mg_constrained_dofs.get_boundary_indices(level)); level_constraints.close(); diff --git a/tests/petsc/step-77-snes.cc b/tests/petsc/step-77-snes.cc index c4f1bcd785..9bc1317f35 100644 --- a/tests/petsc/step-77-snes.cc +++ b/tests/petsc/step-77-snes.cc @@ -182,7 +182,7 @@ namespace Step77 // Specifically, we need two types of AffineConstraints. // One to handle homogeneous boundary conditions for the update step. zero_constraints.clear(); - zero_constraints.reinit(locally_relevant_dofs); + zero_constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, zero_constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, @@ -193,7 +193,7 @@ namespace Step77 // And another one to handle non-homogeneous boundary conditions // when computing the residual function. bc_constraints.clear(); - bc_constraints.reinit(locally_relevant_dofs); + bc_constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, bc_constraints); VectorTools::interpolate_boundary_values(dof_handler, 0, diff --git a/tests/petsc_complex/fe_get_function_values.cc b/tests/petsc_complex/fe_get_function_values.cc index 26d3134728..acc02a78cd 100644 --- a/tests/petsc_complex/fe_get_function_values.cc +++ b/tests/petsc_complex/fe_get_function_values.cc @@ -104,7 +104,7 @@ test() const types::global_dof_index n_local_dofs = locally_owned_dofs.n_elements(); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); // set vector: diff --git a/tests/petsc_complex/parallel_sparse_matrix_01.cc b/tests/petsc_complex/parallel_sparse_matrix_01.cc index af9599bd54..cf736f7bf8 100644 --- a/tests/petsc_complex/parallel_sparse_matrix_01.cc +++ b/tests/petsc_complex/parallel_sparse_matrix_01.cc @@ -84,7 +84,7 @@ test(const unsigned int poly_degree = 1) vector.reinit(locally_owned_dofs, mpi_communicator); AffineConstraints constraints; - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); diff --git a/tests/sharedtria/pbc_01.cc b/tests/sharedtria/pbc_01.cc index a3d673b35b..b628a13fac 100644 --- a/tests/sharedtria/pbc_01.cc +++ b/tests/sharedtria/pbc_01.cc @@ -52,7 +52,8 @@ test() AffineConstraints constraints; - constraints.reinit(DoFTools::extract_locally_relevant_dofs(dof_handler)); + constraints.reinit(dof_handler.locally_owned_dofs(), + DoFTools::extract_locally_relevant_dofs(dof_handler)); for (unsigned int d = 0; d < dim; ++d) DoFTools::make_periodicity_constraints( dof_handler, 2 * d, 2 * d + 1, d, constraints); diff --git a/tests/simplex/step-40.cc b/tests/simplex/step-40.cc index 3fc0c210ac..d4c96658b7 100644 --- a/tests/simplex/step-40.cc +++ b/tests/simplex/step-40.cc @@ -172,7 +172,7 @@ namespace Step40 system_rhs.reinit(locally_owned_dofs, mpi_communicator); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values( mapping, dof_handler, 0, Functions::ZeroFunction(), constraints); diff --git a/tests/simplex/step-55.cc b/tests/simplex/step-55.cc index e6dffbf5ec..0bf16b6f16 100644 --- a/tests/simplex/step-55.cc +++ b/tests/simplex/step-55.cc @@ -465,7 +465,8 @@ namespace Step55 // to put this function call in, in case adaptive refinement gets // introduced later. { - constraints.reinit(locally_relevant_dofs); + constraints.reinit(dof_handler.locally_owned_dofs(), + locally_relevant_dofs); const FEValuesExtractors::Vector velocities(0); DoFTools::make_hanging_node_constraints(dof_handler, constraints); diff --git a/tests/slepc/step-36_parallel.cc b/tests/slepc/step-36_parallel.cc index bb3a3073d8..03b25aa6fd 100644 --- a/tests/slepc/step-36_parallel.cc +++ b/tests/slepc/step-36_parallel.cc @@ -107,7 +107,7 @@ test(std::string solver_name, std::string preconditioner_name) dealii::DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); dealii::VectorTools::interpolate_boundary_values( dof_handler, 0, dealii::Functions::ZeroFunction(), constraints); diff --git a/tests/slepc/step-36_parallel_02.cc b/tests/slepc/step-36_parallel_02.cc index 3faba96cbb..3c25f7bce4 100644 --- a/tests/slepc/step-36_parallel_02.cc +++ b/tests/slepc/step-36_parallel_02.cc @@ -107,7 +107,7 @@ test(std::string solver_name, std::string preconditioner_name) dealii::DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); dealii::VectorTools::interpolate_boundary_values( dof_handler, 0, dealii::Functions::ZeroFunction(), constraints); diff --git a/tests/slepc/step-36_parallel_03.cc b/tests/slepc/step-36_parallel_03.cc index 5a4e4f5654..f916502696 100644 --- a/tests/slepc/step-36_parallel_03.cc +++ b/tests/slepc/step-36_parallel_03.cc @@ -107,7 +107,7 @@ test(std::string solver_name, std::string preconditioner_name) dealii::DoFTools::extract_locally_relevant_dofs(dof_handler); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); dealii::DoFTools::make_hanging_node_constraints(dof_handler, constraints); dealii::VectorTools::interpolate_boundary_values( dof_handler, 0, dealii::Functions::ZeroFunction(), constraints); diff --git a/tests/trilinos/solver_control_06.cc b/tests/trilinos/solver_control_06.cc index 4e8bbf84a0..46733ab51d 100644 --- a/tests/trilinos/solver_control_06.cc +++ b/tests/trilinos/solver_control_06.cc @@ -202,7 +202,7 @@ Test_Solver_Output::setup_system() system_rhs.reinit(locally_owned_dofs, mpi_comm); constraints.clear(); - constraints.reinit(locally_relevant_dofs); + constraints.reinit(locally_owned_dofs, locally_relevant_dofs); DoFTools::make_hanging_node_constraints(dof_handler, constraints); VectorTools::interpolate_boundary_values(dof_handler, 0,