From bb551e3d33a5e769e783a53fc70bbf8dc30a3697 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 12 Jun 2011 10:37:23 +0000
Subject: [PATCH] remove the TargetSpace parameter of the Cosserat energy class
-- Cosserat materials only make sense with RigidBodyMotion values
[[Imported from SVN: r7418]]
---
cosserat-continuum.cc | 2 +-
dune/gfe/cosseratenergystiffness.hh | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc
index 6b9635b8..ad27cd31 100644
--- a/cosserat-continuum.cc
+++ b/cosserat-continuum.cc
@@ -181,7 +181,7 @@ int main (int argc, char *argv[]) try
// Create an assembler for the Harmonic Energy Functional
// ////////////////////////////////////////////////////////////
- CosseratEnergyLocalStiffness<GridType::LeafGridView,TargetSpace> harmonicEnergyLocalStiffness;
+ CosseratEnergyLocalStiffness<GridType::LeafGridView,3> harmonicEnergyLocalStiffness;
GeodesicFEAssembler<GridType::LeafGridView,TargetSpace> assembler(grid.leafView(),
&harmonicEnergyLocalStiffness);
diff --git a/dune/gfe/cosseratenergystiffness.hh b/dune/gfe/cosseratenergystiffness.hh
index 8e1e0d06..93e7be3a 100644
--- a/dune/gfe/cosseratenergystiffness.hh
+++ b/dune/gfe/cosseratenergystiffness.hh
@@ -6,14 +6,16 @@
#include "localgeodesicfestiffness.hh"
#include "localgeodesicfefunction.hh"
+#include <dune/gfe/rigidbodymotion.hh>
-template<class GridView, class TargetSpace>
+template<class GridView, int dim>
class CosseratEnergyLocalStiffness
- : public LocalGeodesicFEStiffness<GridView,TargetSpace>
+ : public LocalGeodesicFEStiffness<GridView,RigidBodyMotion<dim> >
{
// grid types
typedef typename GridView::Grid::ctype DT;
+ typedef RigidBodyMotion<dim> TargetSpace;
typedef typename TargetSpace::ctype RT;
typedef typename GridView::template Codim<0>::Entity Entity;
@@ -31,10 +33,10 @@ public:
};
-template <class GridView, class TargetSpace>
-typename CosseratEnergyLocalStiffness<GridView, TargetSpace>::RT CosseratEnergyLocalStiffness<GridView, TargetSpace>::
+template <class GridView, int dim>
+typename CosseratEnergyLocalStiffness<GridView, dim>::RT CosseratEnergyLocalStiffness<GridView, dim>::
energy(const Entity& element,
- const std::vector<TargetSpace>& localSolution) const
+ const std::vector<RigidBodyMotion<dim> >& localSolution) const
{
RT energy = 0;
--
GitLab