From a4cafec7d64a6fbec1254e9dd5bba90b88415709 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Tue, 10 Feb 2015 11:44:54 +0100
Subject: [PATCH] StaticMatrix::axpy is deprecated, use Arithmetic::addProduct
instead
---
dune/solvers/transferoperators/genericmultigridtransfer.hh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dune/solvers/transferoperators/genericmultigridtransfer.hh b/dune/solvers/transferoperators/genericmultigridtransfer.hh
index 92f07209..d50319f5 100644
--- a/dune/solvers/transferoperators/genericmultigridtransfer.hh
+++ b/dune/solvers/transferoperators/genericmultigridtransfer.hh
@@ -13,6 +13,7 @@
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include "dune/solvers/common/staticmatrixtools.hh"
+#include <dune/solvers/common/arithmetic.hh>
/** \brief Restriction and prolongation operator for standard multigrid
@@ -825,7 +826,7 @@ public:
// Compute cm = im^T * m * jm
if(TransferOperatorType::block_type::rows==1)
- StaticMatrix::axpy(cm, (*im)[0][0] * (*jm)[0][0], *m);
+ Arithmetic::addProduct(cm, (*im)[0][0] * (*jm)[0][0], *m);
else
StaticMatrix::addTransformedMatrix(cm, *im, *m, *jm);
}
@@ -892,7 +893,7 @@ public:
// Compute cm = im^T * m * jm
if(TransferOperatorType::block_type::rows==1)
- StaticMatrix::axpy(cm, (*im)[0][0] * (*jm)[0][0], *m);
+ Arithmetic::addProduct(cm, (*im)[0][0] * (*jm)[0][0], *m);
else
StaticMatrix::addTransformedMatrix(cm, *im, *m, *jm);
}
--
GitLab