diff --git a/rodobstacle.cc b/rodobstacle.cc index 396df8756910effd171c11151b348537bd8ddddf..416469bd09e4073baf2cc98413f530894be5cf85 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 34dc9d89acc12f9fb9b332938aaf20289cc061b6..45dc801d844a857abbf7a9e90ac928cdbde8d6ef 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 cbf075bc3d990cdb445fc37083fb27498f70566e..e60a1dc561e7ae68321069087fdad7a024940178 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;