]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Trilinos vector reinit should now be safe also with MPI.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 26 Nov 2010 14:43:55 +0000 (14:43 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 26 Nov 2010 14:43:55 +0000 (14:43 +0000)
git-svn-id: https://svn.dealii.org/trunk@22862 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 569bcdbaa7b4185f5c4a6f4fe21de3912dc79d31..b173f7dc2b016cb5cb172c060e9cb0f923e0a880 100644 (file)
@@ -2108,29 +2108,24 @@ namespace TrilinosWrappers
                                       /**
                                        * Print the matrix to the given
                                        * stream, using the format
-                                       * <tt>(line,col) value</tt>,
-                                       * i.e. one nonzero entry of the
-                                       * matrix per line. The optional flag
-                                       * outputs the sparsity pattern in
-                                       * Trilinos style, where even the
-                                       * according processor number is
-                                       * printed to the stream, as well as
-                                       * a summary before actually writing
-                                       * the entries.
+                                       * <tt>(line,col) value</tt>, i.e. one
+                                       * nonzero entry of the matrix per
+                                       * line. The optional flag outputs the
+                                       * sparsity pattern in Trilinos style,
+                                       * where the data is sorted according
+                                       * to the processor number when printed
+                                       * to the stream, as well as a summary
+                                       * of the matrix like the global size.
                                        */
       void print (std::ostream &out,
                  const bool    write_extended_trilinos_info = false) const;
 
-                                        // TODO: Write an overloading
-                                        // of the operator << for output.
-                                        // Since the underlying Trilinos
-                                        // object supports it, this should
-                                        // be very easy.
-
 //@}
-                                    /** @addtogroup Exceptions
-                                     * @{ */
-                                       /**
+/** @addtogroup Exceptions
+ *
+ */
+//@{
+                                      /**
                                         * Exception
                                         */
       DeclException1 (ExcTrilinosError,
@@ -2176,7 +2171,7 @@ namespace TrilinosWrappers
                      << "/" << arg2 << ")"
                      << " of a sparse matrix, but it appears to not"
                      << " exist in the Trilinos sparsity pattern.");
-                                    //@}
+//@}
 
 
 
@@ -3231,9 +3226,7 @@ namespace TrilinosWrappers
                                   // the content -- this is what we need
                                   // since we're going to overwrite that
                                   // anyway in the vmult operation.
-                                  // TODO[TH]: workaround, because fast is
-                                  // not reliable with MPI right now.
-    temp_vector.reinit(dst, false);
+    temp_vector.reinit(dst, true);
 
     vmult (temp_vector, src);
     dst += temp_vector;

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.