]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix columns in distribute_local_to_global with rectangular matrices.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Wed, 25 Aug 2010 19:12:16 +0000 (19:12 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Wed, 25 Aug 2010 19:12:16 +0000 (19:12 +0000)
git-svn-id: https://svn.dealii.org/trunk@21714 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/constraint_matrix.templates.h

index 1bf937f70c5b22dedaa9c94051cc288b95bf0876..042080ceb174b30fab327cb8736264dfd93aa68a 100644 (file)
@@ -1496,7 +1496,7 @@ namespace internals
                                   // resulting values in val_ptr, and the
                                   // corresponding column indices in col_ptr.
   template <typename number>
-  static inline
+  inline
   void
   resolve_matrix_row (const GlobalRowsFromLocal&global_rows,
                       const GlobalRowsFromLocal&global_cols,
@@ -1516,7 +1516,8 @@ namespace internals
                                     // of checks). the only check we actually
                                     // need to perform is whether the matrix
                                     // element is zero.
-    if (global_rows.have_indirect_rows() == false)
+    if (global_rows.have_indirect_rows() == false &&
+       global_cols.have_indirect_rows() == false)
       {
        AssertIndexRange(loc_row, local_matrix.m());
        const double * matrix_ptr = &local_matrix(loc_row, 0);
@@ -1596,7 +1597,7 @@ namespace internals
                                   // operations just in place, i.e., in the
                                   // respective matrix row
   template <typename number>
-  static inline
+  inline
   void
   resolve_matrix_row (const GlobalRowsFromLocal&global_rows,
                      const unsigned int        i,
@@ -1748,7 +1749,7 @@ namespace internals
                                   // will be added to the given global row
                                   // global_rows[i] as before, now for sparsity
                                   // pattern
-  static inline
+  inline
   void
   resolve_matrix_row (const GlobalRowsFromLocal     &global_rows,
                      const unsigned int             i,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.