Skip to content
Snippets Groups Projects
Commit 8fd48a02 authored by Oliver Sander's avatar Oliver Sander Committed by sander@FU-BERLIN.DE
Browse files

replace array of matrices by a Tensor3

[[Imported from SVN: r7555]]
parent cef85088
No related branches found
No related tags found
No related merge requests found
...@@ -238,7 +238,7 @@ energy(const Entity& element, ...@@ -238,7 +238,7 @@ energy(const Entity& element,
// transform to matrix coordinates: // transform to matrix coordinates:
// first get the derivative of the embedding of H_1 into R^{3\times3} // first get the derivative of the embedding of H_1 into R^{3\times3}
Dune::array<Dune::FieldMatrix<double,3 , 4>, 3> dd_dq; Tensor3<double,3 , 3, 4> dd_dq;
value.q.getFirstDerivativesOfDirectors(dd_dq); value.q.getFirstDerivativesOfDirectors(dd_dq);
// //
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include <dune/gfe/tensor3.hh>
template <class T> template <class T>
class Quaternion : public Dune::FieldVector<T,4> class Quaternion : public Dune::FieldVector<T,4>
{ {
...@@ -94,7 +96,7 @@ public: ...@@ -94,7 +96,7 @@ public:
return d; return d;
} }
void getFirstDerivativesOfDirectors(Dune::array<Dune::FieldMatrix<double,3 , 4>, 3>& dd_dq) const void getFirstDerivativesOfDirectors(Tensor3<double,3, 3, 4>& dd_dq) const
{ {
const Quaternion<T>& q = (*this); const Quaternion<T>& q = (*this);
......
...@@ -563,7 +563,7 @@ assembleGradient(const Entity& element, ...@@ -563,7 +563,7 @@ assembleGradient(const Entity& element,
// dd_dvij[m][i][j] = \parder {(d_k)_i} {q} // dd_dvij[m][i][j] = \parder {(d_k)_i} {q}
array<FieldMatrix<double,3 , 4>, 3> dd_dq; Tensor3<double,3 ,3, 4> dd_dq;
q.getFirstDerivativesOfDirectors(dd_dq); q.getFirstDerivativesOfDirectors(dd_dq);
// First derivatives of the position // First derivatives of the position
......
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