From 78b8ecbe55b5c25b65d70cc4806076be53f763f0 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 31 Oct 2013 13:50:01 +0000
Subject: [PATCH] Use method crossProduct from arithmetic.hh instead of the one
from crossproduct.hh
[[Imported from SVN: r9526]]
---
dune/gfe/averageinterface.hh | 6 +++---
dune/gfe/rodfactory.hh | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/gfe/averageinterface.hh b/dune/gfe/averageinterface.hh
index 3adddd73..af88f81a 100644
--- a/dune/gfe/averageinterface.hh
+++ b/dune/gfe/averageinterface.hh
@@ -10,7 +10,7 @@
#include <dune/istl/preconditioners.hh>
#include <dune/fufem/dgindexset.hh>
-#include <dune/fufem/crossproduct.hh>
+#include <dune/fufem/arithmetic.hh>
#include <dune/fufem/surfmassmatrix.hh>
#include <dune/fufem/functions/basisgridfunction.hh>
@@ -500,7 +500,7 @@ void computeTotalForceAndTorque(const BoundaryPatch<GridView>& interface,
neumannFunction.evaluateLocal(*it->inside(), quadPos, value);
totalForce.axpy(quad[ip].weight() * integrationElement, value);
- totalTorque.axpy(quad[ip].weight() * integrationElement, crossProduct(worldPos-center,value));
+ totalTorque.axpy(quad[ip].weight() * integrationElement, Arithmetic::crossProduct(worldPos-center,value));
}
@@ -607,7 +607,7 @@ void computeAveragePressure(const typename RigidBodyMotion<double,GridView::dime
phi_i[j] = shapeFunctionValues[indexInFace];
mu_tilde[i][j].axpy(quad[qp].weight() * integrationElement,
- crossProduct(Dune::FieldVector<double,dim>(worldPos-centerOfTorque), phi_i));
+ Arithmetic::crossProduct(Dune::FieldVector<double,dim>(worldPos-centerOfTorque), phi_i));
}
diff --git a/dune/gfe/rodfactory.hh b/dune/gfe/rodfactory.hh
index c48488c5..24ad9f86 100644
--- a/dune/gfe/rodfactory.hh
+++ b/dune/gfe/rodfactory.hh
@@ -3,7 +3,7 @@
#include <vector>
#include <dune/common/fvector.hh>
-#include <dune/fufem/crossproduct.hh>
+#include <dune/fufem/arithmetic.hh>
#include <dune/gfe/rigidbodymotion.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
@@ -39,7 +39,7 @@ template <int dim>
Dune::FieldVector<double,3> zAxis(0);
zAxis[2] = 1;
- Dune::FieldVector<double,3> axis = crossProduct(Dune::FieldVector<double,3>(end-beginning), zAxis);
+ Dune::FieldVector<double,3> axis = Arithmetic::crossProduct(Dune::FieldVector<double,3>(end-beginning), zAxis);
if (axis.two_norm() != 0)
axis /= -axis.two_norm();
--
GitLab