From cd5316f001568190c5b2fe5a76bca91374d59a10 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Sat, 12 Aug 2023 17:46:05 +0200 Subject: [PATCH] Uncover bug in AffineConstraints::shift --- tests/dofs/dof_constraints_12.cc | 76 ++++++++++++++++++++++++++++ tests/dofs/dof_constraints_12.output | 10 ++++ tests/dofs/dof_constraints_13.cc | 76 ++++++++++++++++++++++++++++ tests/dofs/dof_constraints_13.output | 10 ++++ 4 files changed, 172 insertions(+) create mode 100644 tests/dofs/dof_constraints_12.cc create mode 100644 tests/dofs/dof_constraints_12.output create mode 100644 tests/dofs/dof_constraints_13.cc create mode 100644 tests/dofs/dof_constraints_13.output diff --git a/tests/dofs/dof_constraints_12.cc b/tests/dofs/dof_constraints_12.cc new file mode 100644 index 0000000000..719e7f27b1 --- /dev/null +++ b/tests/dofs/dof_constraints_12.cc @@ -0,0 +1,76 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2023 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. +// +// --------------------------------------------------------------------- + + + +// check that the AffineConstraints::shift() method works as expected. + +#include + +#include "../tests.h" + + +int +main() +{ + initlog(); + + unsigned int n1 = 10, n2 = 5; + + auto local_lines1 = complete_index_set(n1); + auto local_lines2 = complete_index_set(n2); + 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); + + constraints1.add_line(1); + constraints1.add_entry(1, 2, 1.0); + + constraints2.add_line(2); + constraints2.add_entry(2, 3, 2.0); + + constraints1.close(); + constraints2.close(); + + deallog << "constraints1: " << std::endl; + constraints1.print(deallog.get_file_stream()); + deallog << "constraints2: " << std::endl; + constraints2.print(deallog.get_file_stream()); + + // Now I want to build the union of the two constraints. + // According to the documentation, I can shift the second, then merge. + // Since in applications you usually need also the second constraints, + // do this on a copy. + { + AffineConstraints tmp; //(local_lines2); + tmp.merge(constraints2); + tmp.shift(n1); + deallog << "constraints2 shifted:" << std::endl; + tmp.print(deallog.get_file_stream()); + + constraints.merge(constraints1, + AffineConstraints::no_conflicts_allowed, + true); + constraints.merge(tmp, + AffineConstraints::no_conflicts_allowed, + true); + } + constraints.close(); + deallog << "constraints: " << std::endl; + constraints.print(deallog.get_file_stream()); +} diff --git a/tests/dofs/dof_constraints_12.output b/tests/dofs/dof_constraints_12.output new file mode 100644 index 0000000000..c305c33d80 --- /dev/null +++ b/tests/dofs/dof_constraints_12.output @@ -0,0 +1,10 @@ + +DEAL::constraints1: + 1 2: 1.00000 +DEAL::constraints2: + 2 3: 2.00000 +DEAL::constraints2 shifted: + 12 13: 2.00000 +DEAL::constraints: + 1 2: 1.00000 + 12 13: 2.00000 diff --git a/tests/dofs/dof_constraints_13.cc b/tests/dofs/dof_constraints_13.cc new file mode 100644 index 0000000000..d76d6b6f5d --- /dev/null +++ b/tests/dofs/dof_constraints_13.cc @@ -0,0 +1,76 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2023 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. +// +// --------------------------------------------------------------------- + + + +// check that the AffineConstraints::shift() method works as expected. + +#include + +#include "../tests.h" + + +int +main() +{ + initlog(); + + unsigned int n1 = 10, n2 = 5; + + auto local_lines1 = complete_index_set(n1); + auto local_lines2 = complete_index_set(n2); + 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); + + constraints1.add_line(1); + constraints1.add_entry(1, 2, 1.0); + + constraints2.add_line(2); + constraints2.add_entry(2, 3, 2.0); + + constraints1.close(); + constraints2.close(); + + deallog << "constraints1: " << std::endl; + constraints1.print(deallog.get_file_stream()); + deallog << "constraints2: " << std::endl; + constraints2.print(deallog.get_file_stream()); + + // Now I want to build the union of the two constraints. + // According to the documentation, I can shift the second, then merge. + // Since in applications you usually need also the second constraints, + // do this on a copy. + { + AffineConstraints tmp(local_lines2); + tmp.merge(constraints2); + tmp.shift(n1); + deallog << "constraints2 shifted:" << std::endl; + tmp.print(deallog.get_file_stream()); + + constraints.merge(constraints1, + AffineConstraints::no_conflicts_allowed, + true); + constraints.merge(tmp, + AffineConstraints::no_conflicts_allowed, + true); + } + constraints.close(); + deallog << "constraints: " << std::endl; + constraints.print(deallog.get_file_stream()); +} diff --git a/tests/dofs/dof_constraints_13.output b/tests/dofs/dof_constraints_13.output new file mode 100644 index 0000000000..c305c33d80 --- /dev/null +++ b/tests/dofs/dof_constraints_13.output @@ -0,0 +1,10 @@ + +DEAL::constraints1: + 1 2: 1.00000 +DEAL::constraints2: + 2 3: 2.00000 +DEAL::constraints2 shifted: + 12 13: 2.00000 +DEAL::constraints: + 1 2: 1.00000 + 12 13: 2.00000 -- 2.39.5