From 5b345f620aff9278d476e454777108bd95f9f096 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 23 Jun 2014 16:52:46 +0200
Subject: [PATCH] [Cleanup]: Move/Ren. convexCombination -> midpoint
---
src/sand-wedge-data/midpoint.hh | 12 ++++++++++++
src/sand-wedge-data/mygeometry.hh | 18 +++++-------------
2 files changed, 17 insertions(+), 13 deletions(-)
create mode 100644 src/sand-wedge-data/midpoint.hh
diff --git a/src/sand-wedge-data/midpoint.hh b/src/sand-wedge-data/midpoint.hh
new file mode 100644
index 00000000..27a2fd4f
--- /dev/null
+++ b/src/sand-wedge-data/midpoint.hh
@@ -0,0 +1,12 @@
+#ifndef SRC_MIDPOINT_HH
+#define SRC_MIDPOINT_HH
+
+#include <dune/solvers/common/arithmetic.hh>
+
+template <class Vector> Vector midPoint(Vector const &x, Vector const &y) {
+ Vector ret{ 0 };
+ Arithmetic::addProduct(ret, 0.5, x);
+ Arithmetic::addProduct(ret, 0.5, y);
+ return ret;
+}
+#endif
diff --git a/src/sand-wedge-data/mygeometry.hh b/src/sand-wedge-data/mygeometry.hh
index 468175d7..d3b122bb 100644
--- a/src/sand-wedge-data/mygeometry.hh
+++ b/src/sand-wedge-data/mygeometry.hh
@@ -3,14 +3,14 @@
#include <dune/common/fvector.hh>
-#include <dune/fufem/arithmetic.hh>
-
#ifdef HAVE_CAIROMM
#include <cairomm/context.h>
#include <cairomm/fontface.h>
#include <cairomm/surface.h>
#endif
+#include "midpoint.hh"
+
namespace MyGeometry {
namespace {
using LocalVector2D = Dune::FieldVector<double, 2>;
@@ -35,14 +35,6 @@ namespace {
ret[1][1] = a22;
return ret;
}
-
- LocalVector2D convexCombination(LocalVector2D const &x,
- LocalVector2D const &y) {
- LocalVector2D ret{ 0 };
- Arithmetic::addProduct(ret, 0.5, x);
- Arithmetic::addProduct(ret, 0.5, y);
- return ret;
- }
}
namespace reference {
@@ -67,9 +59,9 @@ namespace reference {
createVector(B[0] - leftLeg * viscoHeight / rightLeg, B[1] + viscoHeight);
LocalVector2D const M = createVector(B[0], B[1] + viscoHeight);
- LocalVector2D const G = convexCombination(A, X);
- LocalVector2D const H = convexCombination(X, Y);
- LocalVector2D const J = convexCombination(Y, B);
+ LocalVector2D const G = midPoint(A, X);
+ LocalVector2D const H = midPoint(X, Y);
+ LocalVector2D const J = midPoint(Y, B);
LocalVector2D const I = createVector(Y[0] + G[0], Y[1] + G[1]);
--
GitLab