From 8fd48a0224c66d80f7d9bb0bfc12dc62053e9563 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 13 Jul 2011 07:49:23 +0000
Subject: [PATCH] replace array of matrices by a Tensor3
[[Imported from SVN: r7555]]
---
dune/gfe/cosseratenergystiffness.hh | 2 +-
dune/gfe/quaternion.hh | 4 +++-
dune/gfe/rodlocalstiffness.hh | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dune/gfe/cosseratenergystiffness.hh b/dune/gfe/cosseratenergystiffness.hh
index 4dcc4d5f..70e849c7 100644
--- a/dune/gfe/cosseratenergystiffness.hh
+++ b/dune/gfe/cosseratenergystiffness.hh
@@ -238,7 +238,7 @@ energy(const Entity& element,
// transform to matrix coordinates:
// 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);
//
diff --git a/dune/gfe/quaternion.hh b/dune/gfe/quaternion.hh
index 712b2a54..b518c325 100644
--- a/dune/gfe/quaternion.hh
+++ b/dune/gfe/quaternion.hh
@@ -6,6 +6,8 @@
#include <dune/common/fmatrix.hh>
#include <dune/common/exceptions.hh>
+#include <dune/gfe/tensor3.hh>
+
template <class T>
class Quaternion : public Dune::FieldVector<T,4>
{
@@ -94,7 +96,7 @@ public:
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);
diff --git a/dune/gfe/rodlocalstiffness.hh b/dune/gfe/rodlocalstiffness.hh
index 692a604b..f0dfc6ae 100644
--- a/dune/gfe/rodlocalstiffness.hh
+++ b/dune/gfe/rodlocalstiffness.hh
@@ -563,7 +563,7 @@ assembleGradient(const Entity& element,
// 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);
// First derivatives of the position
--
GitLab