From 85f54e4a7386c41abdf3803673edb6ceca2fc2a7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 3 Jul 2013 13:46:20 +0200
Subject: [PATCH] [Cleanup] Use Arithmetic
---
dune/tectonic/mydirectionalconvexfunction.hh | 6 +++---
src/one-body-sample.cc | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/tectonic/mydirectionalconvexfunction.hh b/dune/tectonic/mydirectionalconvexfunction.hh
index 0b2016d4..9f147ae4 100644
--- a/dune/tectonic/mydirectionalconvexfunction.hh
+++ b/dune/tectonic/mydirectionalconvexfunction.hh
@@ -55,9 +55,9 @@ template <class NonlinearityType> class MyDirectionalConvexFunction {
double linearPart() const { return b; }
void subDiff(double x, Interval<double> &D) const {
- VectorType tmp = u;
- tmp.axpy(x, v);
- phi.directionalSubDiff(tmp, v, D);
+ VectorType uxv = u;
+ Arithmetic::addProduct(uxv, x, v);
+ phi.directionalSubDiff(uxv, v, D);
D[0] += A * x - b;
D[1] += A * x - b;
}
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index a7b0719d..0c01069e 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -447,7 +447,7 @@ int main(int argc, char *argv[]) {
dampingWriter << "N ";
} else { // alpha is still the old time step here
alpha *= damping;
- alpha.axpy(1.0 - damping, computed_state);
+ Arithmetic::addProduct(alpha, 1.0 - damping, computed_state);
dampingWriter << "Y ";
}
lastCorrection = correction;
--
GitLab