From 824a32dd3fc07682ad877e1b1abee0d7b30fe0b4 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 9 Mar 2010 16:15:34 +0000
Subject: [PATCH] PlanarRodAssembler is now the 2d specialization of
RodAssembler
[[Imported from SVN: r5725]]
---
rodobstacle.cc | 2 +-
src/rodassembler.cc | 8 ++++----
src/rodassembler.hh | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rodobstacle.cc b/rodobstacle.cc
index 396df875..416469bd 100644
--- a/rodobstacle.cc
+++ b/rodobstacle.cc
@@ -181,7 +181,7 @@ int main (int argc, char *argv[]) try
MatrixType hessianMatrix;
- PlanarRodAssembler<GridType::LeafGridView> rodAssembler(grid.leafView());
+ RodAssembler<GridType::LeafGridView,2> rodAssembler(grid.leafView());
rodAssembler.setParameters(1, 350000, 350000);
diff --git a/src/rodassembler.cc b/src/rodassembler.cc
index 34dc9d89..45dc801d 100644
--- a/src/rodassembler.cc
+++ b/src/rodassembler.cc
@@ -215,7 +215,7 @@ getResultantForce(const BoundaryPatchBase<PatchGridView>& boundary,
template <class GridView>
-void PlanarRodAssembler<GridView>::
+void RodAssembler<GridView,2>::
assembleMatrix(const std::vector<RigidBodyMotion<2> >& sol,
Dune::BCRSMatrix<MatrixBlock>& matrix)
{
@@ -270,7 +270,7 @@ assembleMatrix(const std::vector<RigidBodyMotion<2> >& sol,
template <class GridView>
template <class MatrixType>
-void PlanarRodAssembler<GridView>::
+void RodAssembler<GridView,2>::
getLocalMatrix( EntityType &entity,
const std::vector<RigidBodyMotion<2> >& localSolution,
const int matSize, MatrixType& localMat) const
@@ -421,7 +421,7 @@ getLocalMatrix( EntityType &entity,
}
template <class GridView>
-void PlanarRodAssembler<GridView>::
+void RodAssembler<GridView,2>::
assembleGradient(const std::vector<RigidBodyMotion<2> >& sol,
Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const
{
@@ -522,7 +522,7 @@ assembleGradient(const std::vector<RigidBodyMotion<2> >& sol,
template <class GridView>
-double PlanarRodAssembler<GridView>::
+double RodAssembler<GridView,2>::
computeEnergy(const std::vector<RigidBodyMotion<2> >& sol) const
{
double energy = 0;
diff --git a/src/rodassembler.hh b/src/rodassembler.hh
index cbf075bc..e60a1dc5 100644
--- a/src/rodassembler.hh
+++ b/src/rodassembler.hh
@@ -89,7 +89,7 @@ public:
/** \brief The FEM operator for a 2D extensible, shearable rod
*/
template <class GridView>
-class PlanarRodAssembler : public GeodesicFEAssembler<GridView, RigidBodyMotion<2> >
+class RodAssembler<GridView,2> : public GeodesicFEAssembler<GridView, RigidBodyMotion<2> >
{
typedef typename GridView::template Codim<0>::Entity EntityType;
@@ -114,7 +114,7 @@ class PlanarRodAssembler : public GeodesicFEAssembler<GridView, RigidBodyMotion<
public:
//! ???
- PlanarRodAssembler(const GridView &gridView)
+ RodAssembler(const GridView &gridView)
: GeodesicFEAssembler<GridView, RigidBodyMotion<2> >(gridView,NULL)
{
B = 1;
@@ -122,7 +122,7 @@ public:
A3 = 1;
}
- ~PlanarRodAssembler() {}
+ ~RodAssembler() {}
void setParameters(double b, double a1, double a3) {
B = b;
--
GitLab