From bdc2edbe8fb87573dcb98fa8fca5237d49540241 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 7 Oct 2010 17:03:16 +0000
Subject: [PATCH] hack: add explicit cast to FieldVector to compile the code
again after the introduction of DenseVector in dune-common
[[Imported from SVN: r6390]]
---
dune/gfe/averageinterface.hh | 4 ++--
dune/gfe/makestraightrod.hh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dune/gfe/averageinterface.hh b/dune/gfe/averageinterface.hh
index e56b9496..05afb8e1 100644
--- a/dune/gfe/averageinterface.hh
+++ b/dune/gfe/averageinterface.hh
@@ -458,7 +458,7 @@ void computeTotalForceAndTorque(const BoundaryPatchBase<GridView>& interface,
// Sum up the total torque \int (x - x_0) \times f dx
Dune::FieldVector<double,dim> worldPos = it->geometry().global(quadPos);
outputTorque.axpy(quad[qp].weight()*integrationElement,
- crossProduct(worldPos - center, localPressure));
+ crossProduct(Dune::FieldVector<double,dim>(worldPos - center), localPressure));
}
@@ -568,7 +568,7 @@ void computeAveragePressure(const Dune::FieldVector<double,GridType::dimension>&
phi_i[j] = shapeFunctionValues[i];
mu_tilde[i][j].axpy(quad[qp].weight() * integrationElement,
- crossProduct(worldPos-crossSection.r, phi_i));
+ crossProduct(Dune::FieldVector<double,dim>(worldPos-crossSection.r), phi_i));
}
diff --git a/dune/gfe/makestraightrod.hh b/dune/gfe/makestraightrod.hh
index 4facbc62..50df6eab 100644
--- a/dune/gfe/makestraightrod.hh
+++ b/dune/gfe/makestraightrod.hh
@@ -21,7 +21,7 @@ void makeStraightRod(std::vector<RigidBodyMotion<dim> >& rod, int n,
Dune::FieldVector<double,3> zAxis(0);
zAxis[2] = 1;
- Dune::FieldVector<double,3> axis = crossProduct(end-beginning, zAxis);
+ Dune::FieldVector<double,3> axis = crossProduct(Dune::FieldVector<double,3>(end-beginning), zAxis);
if (axis.two_norm() != 0)
axis /= -axis.two_norm();
--
GitLab