]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Minor fixes.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 8 Jun 2009 09:16:31 +0000 (09:16 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 8 Jun 2009 09:16:31 +0000 (09:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@18917 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/trilinos_precondition.h
deal.II/lac/source/trilinos_sparse_matrix.cc

index 0e5ee7303f3766add25d3ee145da2c7fe67cdba7..897d3e5cdce0186ac4d36d1500563492d2e40402 100755 (executable)
@@ -1513,12 +1513,10 @@ namespace TrilinosWrappers
                                        // non-constant value, as this
                                        // is the way Trilinos wants
                                        // to have them.
-  template <typename number>
   inline
-  void PreconditionBase::vmult (dealii::Vector<number>       &dst,
-                               const dealii::Vector<number> &src) const
+  void PreconditionBase::vmult (dealii::Vector<double>       &dst,
+                               const dealii::Vector<double> &src) const
   {
-    
     Epetra_Vector LHS (View, preconditioner->OperatorDomainMap(),
                       dst.begin());
     Epetra_Vector RHS (View, preconditioner->OperatorRangeMap(),
index 29e4ddb8e9ce635487d4959b0d935d97ccd4ba57..86d04fa04e0d82a26b9527e2efbb913fca20e92c 100755 (executable)
@@ -978,7 +978,7 @@ namespace TrilinosWrappers
                                   // create a suitable operator B: in case
                                   // we do not use a vector, all we need to
                                   // do is to set the pointer. Otherwise,
-                                  // we insert insert the data from B, but
+                                  // we insert the data from B, but
                                   // multiply each row with the respective
                                   // vector element.
       Teuchos::RCP<Epetra_CrsMatrix> mod_B;
@@ -1014,7 +1014,8 @@ namespace TrilinosWrappers
                                   // use ML built-in method for performing
                                   // the matrix-matrix product.
                                   // create ML operators on top of the
-                                  // Epetra matrix.
+                                  // Epetra matrices. if we use a
+                                  // transposed matrix, let ML know it
       ML_Comm* comm;
       ML_Comm_Create(&comm);
       ML_Operator *A_ = ML_Operator_Create(comm);
@@ -1034,13 +1035,12 @@ namespace TrilinosWrappers
 
       ML_Operator_WrapEpetraCrsMatrix(&*mod_B,B_,false);
 
-                                  // We do the multiplication by hand since
-                                  // we can save some operations compared
-                                  // to just calling
-                                  // ml/src/Operator/ml_rap.c that
-                                  // multiplies three matrices. This code
-                                  // is still similar to the one found in
-                                  // ml/src/Operator/ml_rap.c
+                                  // We implement the multiplication by
+                                  // hand in a similar way as is done in
+                                  // ml/src/Operator/ml_rap.c for a triple
+                                  // matrix product. This means that the
+                                  // code is very similar to the one found
+                                  // in ml/src/Operator/ml_rap.c
 
                                   // import data if necessary
       ML_Operator *Btmp, *Ctmp, *Ctmp2, *tptr;

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.