From e539533cf43da6829115605f7093698b72c931af Mon Sep 17 00:00:00 2001
From: kronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 26 Jun 2014 12:05:54 +0000
Subject: [PATCH] Need to keep constrained entries also when giving both row
 and column indices if so requested.

git-svn-id: https://svn.dealii.org/trunk@33087 0785d39b-7218-0410-832d-ea1e28bc413d
---
 .../deal.II/lac/constraint_matrix.templates.h | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/deal.II/include/deal.II/lac/constraint_matrix.templates.h b/deal.II/include/deal.II/lac/constraint_matrix.templates.h
index 2cf08a4f3d..a1a97f6a95 100644
--- a/deal.II/include/deal.II/lac/constraint_matrix.templates.h
+++ b/deal.II/include/deal.II/lac/constraint_matrix.templates.h
@@ -2869,6 +2869,20 @@ add_entries_local_to_global (const std::vector<size_type> &row_indices,
   if (dof_mask.n_rows() == n_local_rows && dof_mask.n_cols() == n_local_cols)
     dof_mask_is_active = true;
 
+  // if constrained entries should be kept, need to add rows and columns of
+  // those to the sparsity pattern
+  if (keep_constrained_entries == true)
+    {
+      for (size_type i=0; i<row_indices.size(); i++)
+        if (is_constrained(row_indices[i]))
+          for (size_type j=0; j<col_indices.size(); j++)
+            sparsity_pattern.add (row_indices[i], col_indices[j]);
+      for (size_type i=0; i<col_indices.size(); i++)
+        if (is_constrained(col_indices[i]))
+          for (size_type j=0; j<row_indices.size(); j++)
+            sparsity_pattern.add (row_indices[j], col_indices[i]);
+    }
+
   // if the dof mask is not active, all we have to do is to add some indices
   // in a matrix format. To do this, we first create an array of all the
   // indices that are to be added. these indices are the local dof indices
@@ -2891,20 +2905,6 @@ add_entries_local_to_global (const std::vector<size_type> &row_indices,
       return;
     }
 
-  // if constrained entries should be kept, need to add rows and columns of
-  // those to the sparsity pattern
-  if (keep_constrained_entries == true)
-    {
-      for (size_type i=0; i<row_indices.size(); i++)
-        if (is_constrained(row_indices[i]))
-          for (size_type j=0; j<col_indices.size(); j++)
-            sparsity_pattern.add (row_indices[i], col_indices[j]);
-      for (size_type i=0; i<col_indices.size(); i++)
-        if (is_constrained(col_indices[i]))
-          for (size_type j=0; j<row_indices.size(); j++)
-            sparsity_pattern.add (row_indices[j], col_indices[i]);
-    }
-
 
   // TODO: implement this
   Assert (false, ExcNotImplemented());
-- 
2.39.5