From 87347c8e125a2051064ac5a5813a23ea391eed62 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 8 Jun 2009 09:16:31 +0000 Subject: [PATCH] Minor fixes. git-svn-id: https://svn.dealii.org/trunk@18917 0785d39b-7218-0410-832d-ea1e28bc413d --- .../lac/include/lac/trilinos_precondition.h | 6 ++---- deal.II/lac/source/trilinos_sparse_matrix.cc | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/deal.II/lac/include/lac/trilinos_precondition.h b/deal.II/lac/include/lac/trilinos_precondition.h index 0e5ee7303f..897d3e5cdc 100755 --- a/deal.II/lac/include/lac/trilinos_precondition.h +++ b/deal.II/lac/include/lac/trilinos_precondition.h @@ -1513,12 +1513,10 @@ namespace TrilinosWrappers // non-constant value, as this // is the way Trilinos wants // to have them. - template inline - void PreconditionBase::vmult (dealii::Vector &dst, - const dealii::Vector &src) const + void PreconditionBase::vmult (dealii::Vector &dst, + const dealii::Vector &src) const { - Epetra_Vector LHS (View, preconditioner->OperatorDomainMap(), dst.begin()); Epetra_Vector RHS (View, preconditioner->OperatorRangeMap(), diff --git a/deal.II/lac/source/trilinos_sparse_matrix.cc b/deal.II/lac/source/trilinos_sparse_matrix.cc index 29e4ddb8e9..86d04fa04e 100755 --- a/deal.II/lac/source/trilinos_sparse_matrix.cc +++ b/deal.II/lac/source/trilinos_sparse_matrix.cc @@ -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 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; -- 2.39.5