From df29698c06798af961d34a60cc7411d84d90898a Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 19 Apr 2009 08:49:19 +0000
Subject: [PATCH] accept local assembler as constructor argument
[[Imported from SVN: r4055]]
---
src/geodesicfeassembler.hh | 6 ++++--
src/rodassembler.hh | 9 ++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/geodesicfeassembler.hh b/src/geodesicfeassembler.hh
index ce2b4519..f6573046 100644
--- a/src/geodesicfeassembler.hh
+++ b/src/geodesicfeassembler.hh
@@ -34,8 +34,10 @@ class GeodesicFEAssembler {
public:
/** \brief Constructor for a given grid */
- GeodesicFEAssembler(const GridView& gridView) :
- gridView_(gridView)
+ GeodesicFEAssembler(const GridView& gridView,
+ LocalGeodesicFEStiffness<GridView,TargetSpace>* localStiffness)
+ : gridView_(gridView),
+ localStiffness_(localStiffness)
{}
/** \brief Assemble the tangent stiffness matrix
diff --git a/src/rodassembler.hh b/src/rodassembler.hh
index 8928383c..407a52a7 100644
--- a/src/rodassembler.hh
+++ b/src/rodassembler.hh
@@ -9,6 +9,7 @@
#include <dune/ag-common/boundarypatch.hh>
#include "rigidbodymotion.hh"
+#include "rodlocalstiffness.hh"
#include "geodesicfeassembler.hh"
/** \brief The FEM operator for an extensible, shearable rod
@@ -47,9 +48,11 @@ class RodAssembler : public GeodesicFEAssembler<typename GridType::LeafGridView,
public:
//! ???
- RodAssembler(const GridType &grid) :
- GeodesicFEAssembler<typename GridType::LeafGridView, RigidBodyMotion<3> >(grid.leafView()),
- grid_(&grid)
+ RodAssembler(const GridType &grid,
+ RodLocalStiffness<typename GridType::LeafGridView,double>* localStiffness) :
+ GeodesicFEAssembler<typename GridType::LeafGridView, RigidBodyMotion<3> >(grid.leafView(),
+ localStiffness),
+ grid_(&grid)
{
// Set dummy material parameters
K_[0] = K_[1] = K_[2] = 1;
--
GitLab