From 09a8e8a9bf1de9ba60cb77089d4c727c2fcc5b15 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 17 Jan 2017 18:01:50 +0100 Subject: [PATCH] Extend documentation --- include/deal.II/lac/constraint_matrix.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h index 1c7c99e720..3c3e758873 100644 --- a/include/deal.II/lac/constraint_matrix.h +++ b/include/deal.II/lac/constraint_matrix.h @@ -359,6 +359,13 @@ public: * second. If this is nevertheless the case, an exception is thrown. * However, this behavior can be changed by providing a different value for * the second argument. + * + * If both this object and the object given as argument are initialized with + * an IndexSet object, local_lines is set to the union of these IndexSet + * objects. + * + * Merging a ConstraintMatrix that is initialized with an IndexSet + * and one that is not initialized with an IndexSet is not yet implemented. */ void merge (const ConstraintMatrix &other_constraints, const MergeConflictBehavior merge_conflict_behavior = no_conflicts_allowed); -- 2.39.5