From: kronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 24 Feb 2014 20:27:05 +0000 (+0000)
Subject: Fix performance regression in serial.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44138488eb0439e19b691a8b61d15d0eff548304;p=dealii-svn.git

Fix performance regression in serial.

git-svn-id: https://svn.dealii.org/trunk@32545 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/source/dofs/dof_renumbering.cc b/deal.II/source/dofs/dof_renumbering.cc
index 3714e05e95..2e8f6497d8 100644
--- a/deal.II/source/dofs/dof_renumbering.cc
+++ b/deal.II/source/dofs/dof_renumbering.cc
@@ -408,22 +408,30 @@ namespace DoFRenumbering
                                              dof_handler.locally_owned_dofs());
         DoFTools::make_sparsity_pattern (dof_handler, csp, constraints);
 
-        // Create sparsity pattern from csp by transferring its indices to
-        // processor-local index space and doing Cuthill-McKee there
-        std::vector<unsigned int> row_lengths(locally_owned.n_elements());
-        for (unsigned int i=0; i<locally_owned.n_elements(); ++i)
-          row_lengths[i] = csp.row_length(locally_owned.nth_index_in_set(i));
-        sparsity.reinit(locally_owned.n_elements(), locally_owned.n_elements(),
-                        row_lengths);
-        for (unsigned int i=0; i<locally_owned.n_elements(); ++i)
+        // If the index set is not complete, need to get indices in local
+        // index space.
+        if (dof_handler.locally_owned_dofs().n_elements() !=
+            dof_handler.locally_owned_dofs().size())
           {
-            const types::global_dof_index row = locally_owned.nth_index_in_set(i);
-            for (CompressedSimpleSparsityPattern::row_iterator it =
-                   csp.row_begin(row); it != csp.row_end(row); ++it)
-              if (*it != row && locally_owned.is_element(*it))
-                sparsity.add(i, locally_owned.index_within_set(*it));
+            // Create sparsity pattern from csp by transferring its indices to
+            // processor-local index space and doing Cuthill-McKee there
+            std::vector<unsigned int> row_lengths(locally_owned.n_elements());
+            for (unsigned int i=0; i<locally_owned.n_elements(); ++i)
+              row_lengths[i] = csp.row_length(locally_owned.nth_index_in_set(i));
+            sparsity.reinit(locally_owned.n_elements(), locally_owned.n_elements(),
+                            row_lengths);
+            for (unsigned int i=0; i<locally_owned.n_elements(); ++i)
+              {
+                const types::global_dof_index row = locally_owned.nth_index_in_set(i);
+                for (CompressedSimpleSparsityPattern::row_iterator it =
+                       csp.row_begin(row); it != csp.row_end(row); ++it)
+                  if (*it != row && locally_owned.is_element(*it))
+                    sparsity.add(i, locally_owned.index_within_set(*it));
+              }
+            sparsity.compress();
           }
-        sparsity.compress();
+        else
+          sparsity.copy_from(csp);
       }
 
     // constraints are not needed anymore