]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Corrected an error when adding/setting a FullMatrix to the Trilinos sparse matrix.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Nov 2008 17:45:34 +0000 (17:45 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Nov 2008 17:45:34 +0000 (17:45 +0000)
git-svn-id: https://svn.dealii.org/trunk@17712 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/trilinos_sparse_matrix.h

index fb226140018c2ea5fcb93ea4718df85b03ee02d1..d9cc3f8ec63e571ae33f0c06c038c4e591547ea2 100755 (executable)
@@ -1073,7 +1073,7 @@ namespace TrilinosWrappers
                const unsigned int    n_cols,
                const unsigned int   *col_indices,
                const TrilinosScalar *values,
-               const bool            elide_zero_values = false);
+               const bool            elide_zero_values = true);
 
                                        /**
                                         * Multiply the entire matrix
@@ -2046,7 +2046,7 @@ namespace TrilinosWrappers
            ExcDimensionMismatch(col_indices.size(), values.n()));
 
     for (unsigned int i=0; i<row_indices.size(); ++i)
-      set (row_indices[i], col_indices.size(), &col_indices[0], &values(0,0),
+      set (row_indices[i], col_indices.size(), &col_indices[0], &values(i,0),
           elide_zero_values);
   }
 
@@ -2246,7 +2246,7 @@ namespace TrilinosWrappers
            ExcDimensionMismatch(col_indices.size(), values.n()));
 
     for (unsigned int i=0; i<row_indices.size(); ++i)
-      add (row_indices[i], col_indices.size(), &col_indices[0], &values(0,0),
+      add (row_indices[i], col_indices.size(), &col_indices[0], &values(i,0),
           elide_zero_values);
   }
 
@@ -2294,7 +2294,7 @@ namespace TrilinosWrappers
                                   // are already available...
     if (elide_zero_values == false)
       {
-       col_index_ptr = (int*)&col_indices[0];
+       col_index_ptr = (int*)col_indices;
        col_value_ptr = values;
       }
     else

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.