From eaaf3dbe48b238f9af3aaee8e673e1c7cfa381e3 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Mon, 30 Mar 2015 15:30:58 +0200
Subject: [PATCH] Adjust to changes of the RiemannianTRSolver
---
dune/gfe/rodfactory.hh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dune/gfe/rodfactory.hh b/dune/gfe/rodfactory.hh
index 55e60b38..edfd4770 100644
--- a/dune/gfe/rodfactory.hh
+++ b/dune/gfe/rodfactory.hh
@@ -190,7 +190,9 @@ void create(std::vector<RigidBodyMotion<double,spaceDim> >& rod,
RodLocalStiffness<GridView,double> rodLocalStiffness(gridView_, radius*radius*M_PI,
std::pow(radius,4) * 0.25* M_PI, std::pow(radius,4) * 0.25* M_PI, E, nu);
- RodAssembler<GridView,spaceDim> assembler(gridView_, &rodLocalStiffness);
+ typedef Dune::Functions::PQKNodalBasis<GridView,1> RodP1Basis;
+ RodP1Basis p1Basis(gridView_);
+ RodAssembler<RodP1Basis,spaceDim> assembler(p1Basis, &rodLocalStiffness);
// Create initial iterate using the straight rod interpolation method
create(rod, beginning.r, end.r);
@@ -203,7 +205,7 @@ void create(std::vector<RigidBodyMotion<double,spaceDim> >& rod,
rod.back() = end;
// Trust--Region solver
- RiemannianTrustRegionSolver<typename GridView::Grid, RigidBodyMotion<double,spaceDim> > rodSolver;
+ RiemannianTrustRegionSolver<RodP1Basis, RigidBodyMotion<double,spaceDim> > rodSolver;
rodSolver.setup(gridView_.grid(), &assembler, rod,
rodDirichletNodes,
1e-10, 100, // TR tolerance and iterations
--
GitLab