From bb60bb159d0b0f447cacb777cf4330a508cb56ae Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 20 Sep 2018 17:58:44 +0200
Subject: [PATCH] Fix wrong matrix types
I found those wrong types when trying to use a HarmonicEnergyStiffness
with a RigidBodyMotion.
---
dune/gfe/localgeodesicfefunction.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dune/gfe/localgeodesicfefunction.hh b/dune/gfe/localgeodesicfefunction.hh
index 091825cf..3502f371 100644
--- a/dune/gfe/localgeodesicfefunction.hh
+++ b/dune/gfe/localgeodesicfefunction.hh
@@ -621,7 +621,7 @@ public:
/** \brief Evaluate the derivative of the function */
DerivativeType evaluateDerivative(const Dune::FieldVector<ctype, dim>& local) const
{
- Dune::FieldMatrix<ctype, embeddedDim, dim> result(0);
+ DerivativeType result(0);
// get translation part
std::vector<Dune::FieldMatrix<ctype,1,dim> > sfDer(translationCoefficients_.size());
@@ -632,7 +632,7 @@ public:
result[j].axpy(translationCoefficients_[i][j], sfDer[i][0]);
// get orientation part
- Dune::FieldMatrix<ctype,4,dim> qResult = orientationFEFunction_->evaluateDerivative(local);
+ Dune::FieldMatrix<field_type,4,dim> qResult = orientationFEFunction_->evaluateDerivative(local);
for (int i=0; i<4; i++)
for (int j=0; j<dim; j++)
result[3+i][j] = qResult[i][j];
--
GitLab