From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Sat, 28 Apr 2018 15:48:57 +0000 (+0200)
Subject: Must check for all (l,j) pairs for possible conflicts in scatter.
X-Git-Tag: v9.0.0-rc1~80^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6378%2Fhead;p=dealii.git

Must check for all (l,j) pairs for possible conflicts in scatter.
---

diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h
index 997b0a5c19..401ea6c75a 100644
--- a/include/deal.II/matrix_free/dof_info.templates.h
+++ b/include/deal.II/matrix_free/dof_info.templates.h
@@ -700,12 +700,13 @@ no_constraint:
                   // do not use interleaved storage if two vectorized
                   // components point to the same field (scatter not possible)
                   for (unsigned int k=0; k<ndofs; ++k)
-                    for (unsigned int j=1; j<n_comp; ++j)
-                      if (dof_indices[j*ndofs+k] == dof_indices[k])
-                        {
-                          index_storage_variants[dof_access_cell][i] = IndexStorageVariants::full;
-                          break;
-                        }
+                    for (unsigned int l=0; l<n_comp; ++l)
+                      for (unsigned int j=l+1; j<n_comp; ++j)
+                        if (dof_indices[j*ndofs+k] == dof_indices[l*ndofs+k])
+                          {
+                            index_storage_variants[dof_access_cell][i] = IndexStorageVariants::full;
+                            break;
+                          }
                   if (index_storage_variants[dof_access_cell][i] != IndexStorageVariants::full)
                     {
                       unsigned int *interleaved_dof_indices =