From: Marc Fehling Date: Fri, 4 Jul 2025 15:41:21 +0000 (+0200) Subject: Fix Affineconstraints deprecations by initializing with `(locally_relevant_dofs,... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894e82d53ece5226c59f3f1307f00056faedbf2f;p=dealii.git Fix Affineconstraints deprecations by initializing with `(locally_relevant_dofs, locally_relevant_dofs)`. --- diff --git a/tests/dofs/dof_constraints_13.cc b/tests/dofs/dof_constraints_13.cc index 4c196f1b46..5dad082c40 100644 --- a/tests/dofs/dof_constraints_13.cc +++ b/tests/dofs/dof_constraints_13.cc @@ -33,9 +33,9 @@ main() auto local_lines = complete_index_set(n1 + n2); // Fake two independent constraints on two independent dofs. - AffineConstraints constraints1(local_lines1); - AffineConstraints constraints2(local_lines2); - AffineConstraints constraints(local_lines); + AffineConstraints constraints1(local_lines1, local_lines1); + AffineConstraints constraints2(local_lines2, local_lines2); + AffineConstraints constraints(local_lines, local_lines); constraints1.add_line(1); constraints1.add_entry(1, 2, 1.0); @@ -56,7 +56,7 @@ main() // Since in applications you usually need also the second constraints, // do this on a copy. { - AffineConstraints tmp(local_lines2); + AffineConstraints tmp(local_lines2, local_lines2); tmp.merge(constraints2); tmp.shift(n1); deallog << "constraints2 shifted:" << std::endl; diff --git a/tests/lac/constraints_01.cc b/tests/lac/constraints_01.cc index 31368822e7..19efcdfad8 100644 --- a/tests/lac/constraints_01.cc +++ b/tests/lac/constraints_01.cc @@ -32,7 +32,7 @@ test() AffineConstraints cm; cm.clear(); - cm.reinit(rel); + cm.reinit(rel, rel); unsigned int inhoms[] = {8385, 8386, 8391, 17886, 17892, 17895, 18066, 18069, 18072, 18075, 18086, 18089, 18092, 18095, diff --git a/tests/lac/constraints_merge_08.cc b/tests/lac/constraints_merge_08.cc index b1a1b9fa03..42453f1d30 100644 --- a/tests/lac/constraints_merge_08.cc +++ b/tests/lac/constraints_merge_08.cc @@ -61,7 +61,8 @@ merge_check() // check that the `merge' function // works correctly - AffineConstraints c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines, local_lines), + c2(local_lines, local_lines); // enter simple line c1.add_line(index_0); diff --git a/tests/lac/constraints_merge_09.cc b/tests/lac/constraints_merge_09.cc index 3f2a3f303c..f573c90b5d 100644 --- a/tests/lac/constraints_merge_09.cc +++ b/tests/lac/constraints_merge_09.cc @@ -59,7 +59,8 @@ merge_check() // check that the `merge' function // works correctly - AffineConstraints c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines, local_lines), + c2(local_lines, local_lines); // enter simple line c1.add_line(index_0); diff --git a/tests/lac/constraints_merge_10.cc b/tests/lac/constraints_merge_10.cc index c78bff3969..4ca1c6a171 100644 --- a/tests/lac/constraints_merge_10.cc +++ b/tests/lac/constraints_merge_10.cc @@ -65,7 +65,8 @@ merge_check() // check that the `merge' function // works correctly - AffineConstraints c1(local_lines1), c2(local_lines2); + AffineConstraints c1(local_lines1, local_lines1), + c2(local_lines2, local_lines2); // enter simple line c1.add_line(index_0); diff --git a/tests/lac/constraints_merge_11.cc b/tests/lac/constraints_merge_11.cc index 62b0cd4f5b..7c992fc34f 100644 --- a/tests/lac/constraints_merge_11.cc +++ b/tests/lac/constraints_merge_11.cc @@ -45,7 +45,8 @@ merge_check() local_lines2.print(deallog.get_file_stream()); // works correctly - AffineConstraints c1(local_lines1), c2(local_lines2); + AffineConstraints c1(local_lines1, local_lines1), + c2(local_lines2, local_lines2); // now merge the two and print the // results diff --git a/tests/lac/constraints_merge_12.cc b/tests/lac/constraints_merge_12.cc index 8797e9d174..ea9d33b003 100644 --- a/tests/lac/constraints_merge_12.cc +++ b/tests/lac/constraints_merge_12.cc @@ -37,7 +37,8 @@ merge_check() local_lines.compress(); // works correctly - AffineConstraints c1(local_lines), c2(local_lines); + AffineConstraints c1(local_lines, local_lines), + c2(local_lines, local_lines); for (types::global_dof_index i = 99999800; i < local_lines.size(); ++i) if (i % 2 == 1) c1.constrain_dof_to_zero(i); diff --git a/tests/lac/constraints_shift_01.cc b/tests/lac/constraints_shift_01.cc index 105eb943fc..b7de39d269 100644 --- a/tests/lac/constraints_shift_01.cc +++ b/tests/lac/constraints_shift_01.cc @@ -40,7 +40,7 @@ test() deallog << "Create AffineConstraints with constraints u(2)=.5*u(5), u(5)=.7*u(8)" << std::endl; - dealii::AffineConstraints constraints1(index_set); + dealii::AffineConstraints constraints1(index_set, index_set); constraints1.add_line(5); constraints1.add_entry(5, 8, .7); constraints1.add_line(2); diff --git a/tests/mpi/constraint_matrix_set_zero_01.cc b/tests/mpi/constraint_matrix_set_zero_01.cc index 4c85cee170..6f65695163 100644 --- a/tests/mpi/constraint_matrix_set_zero_01.cc +++ b/tests/mpi/constraint_matrix_set_zero_01.cc @@ -57,7 +57,8 @@ test() local_active_together.add_range(myid, myid + 1); local_active_together.add_range(numproc + myid * 2, numproc + myid * 2 + 2); - AffineConstraints cm(local_active_together); + AffineConstraints cm(local_active_together, + local_active_together); cm.constrain_dof_to_zero(numproc + myid * 2); cm.close(); diff --git a/tests/mpi/constraint_matrix_set_zero_02.cc b/tests/mpi/constraint_matrix_set_zero_02.cc index 5f76c40604..2867d9676e 100644 --- a/tests/mpi/constraint_matrix_set_zero_02.cc +++ b/tests/mpi/constraint_matrix_set_zero_02.cc @@ -61,7 +61,7 @@ test() local_active_together.add_range(myid, myid + 1); local_active_together.add_range(numproc + myid * 2, numproc + myid * 2 + 2); - AffineConstraints cm(local_active_together); + AffineConstraints cm(local_active_together, local_active_together); cm.constrain_dof_to_zero(numproc + myid * 2); cm.close(); diff --git a/tests/mpi/constraints_crash_01.cc b/tests/mpi/constraints_crash_01.cc index e9c8d35411..d75ecb064e 100644 --- a/tests/mpi/constraints_crash_01.cc +++ b/tests/mpi/constraints_crash_01.cc @@ -38,7 +38,7 @@ test() local_active_together.add_range(0, 3); // local_active_together.compress(); - AffineConstraints cm(local_active_together); + AffineConstraints cm(local_active_together, local_active_together); cm.constrain_dof_to_zero(1); cm.close(); deallog << "OK" << std::endl; diff --git a/tests/mpi/petsc_distribute_01_block.cc b/tests/mpi/petsc_distribute_01_block.cc index 3cd9381dfd..278637b1b3 100644 --- a/tests/mpi/petsc_distribute_01_block.cc +++ b/tests/mpi/petsc_distribute_01_block.cc @@ -84,7 +84,8 @@ test() vec.block(0).size() + std::min(static_cast(100 * myid + 150), vec.block(0).size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(locally_relevant_range, + locally_relevant_range); // add constraints that constrain an element in the middle of the // local range of each processor against an element outside, both in diff --git a/tests/mpi/trilinos_distribute_01_block.cc b/tests/mpi/trilinos_distribute_01_block.cc index 8fcae80580..81b1219819 100644 --- a/tests/mpi/trilinos_distribute_01_block.cc +++ b/tests/mpi/trilinos_distribute_01_block.cc @@ -85,7 +85,7 @@ test() vec.block(0).size() + std::min(static_cast(100 * myid + 150), vec.block(0).size())); - AffineConstraints cm(locally_relevant_range); + AffineConstraints cm(locally_relevant_range, 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