Skip to content
Snippets Groups Projects
Commit bb60bb15 authored by Sander, Oliver's avatar Sander, Oliver
Browse files

Fix wrong matrix types

I found those wrong types when trying to use a HarmonicEnergyStiffness
with a RigidBodyMotion.
parent 6f7eedf6
No related branches found
No related tags found
No related merge requests found
...@@ -621,7 +621,7 @@ public: ...@@ -621,7 +621,7 @@ public:
/** \brief Evaluate the derivative of the function */ /** \brief Evaluate the derivative of the function */
DerivativeType evaluateDerivative(const Dune::FieldVector<ctype, dim>& local) const DerivativeType evaluateDerivative(const Dune::FieldVector<ctype, dim>& local) const
{ {
Dune::FieldMatrix<ctype, embeddedDim, dim> result(0); DerivativeType result(0);
// get translation part // get translation part
std::vector<Dune::FieldMatrix<ctype,1,dim> > sfDer(translationCoefficients_.size()); std::vector<Dune::FieldMatrix<ctype,1,dim> > sfDer(translationCoefficients_.size());
...@@ -632,7 +632,7 @@ public: ...@@ -632,7 +632,7 @@ public:
result[j].axpy(translationCoefficients_[i][j], sfDer[i][0]); result[j].axpy(translationCoefficients_[i][j], sfDer[i][0]);
// get orientation part // 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 i=0; i<4; i++)
for (int j=0; j<dim; j++) for (int j=0; j<dim; j++)
result[3+i][j] = qResult[i][j]; result[3+i][j] = qResult[i][j];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment