From 599859c1253055d3984a5fde0a7535272be475bf Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 30 Jan 2016 15:06:18 +0100
Subject: [PATCH] Adapt to recent changes in dune-functions and the gfe
assembler infrastructure
---
dune/gfe/rodassembler.cc | 5 ++---
dune/gfe/rodlocalstiffness.hh | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dune/gfe/rodassembler.cc b/dune/gfe/rodassembler.cc
index e51cdf69..fb7e472b 100644
--- a/dune/gfe/rodassembler.cc
+++ b/dune/gfe/rodassembler.cc
@@ -25,7 +25,7 @@ assembleGradient(const std::vector<RigidBodyMotion<double,3> >& sol,
grad = 0;
// A view on the FE basis on a single element
- typename Basis::LocalView localView(&this->basis_);
+ auto localView = this->basis_.localView();
auto localIndexSet = this->basis_.indexSet().localIndexSet();
ElementIterator it = this->basis_.gridView().template begin<0>();
@@ -49,8 +49,7 @@ assembleGradient(const std::vector<RigidBodyMotion<double,3> >& sol,
// Assemble local gradient
std::vector<FieldVector<double,blocksize> > localGradient(nDofs);
- this->localStiffness_->assembleGradient(*it,
- localView.tree().finiteElement(),
+ this->localStiffness_->assembleGradient(localView,
localSolution,
localGradient);
diff --git a/dune/gfe/rodlocalstiffness.hh b/dune/gfe/rodlocalstiffness.hh
index ad5133b8..30e136aa 100644
--- a/dune/gfe/rodlocalstiffness.hh
+++ b/dune/gfe/rodlocalstiffness.hh
@@ -15,6 +15,7 @@ class RodLocalStiffness
: public LocalGeodesicFEStiffness<Dune::Functions::PQkNodalBasis<GridView,1>, RigidBodyMotion<RT,3> >
{
typedef RigidBodyMotion<RT,3> TargetSpace;
+ typedef Dune::Functions::PQkNodalBasis<GridView,1> Basis;
// grid types
typedef typename GridView::Grid::ctype DT;
@@ -100,13 +101,12 @@ public:
virtual RT energy (const Entity& e,
const std::array<RigidBodyMotion<RT,3>, dim+1>& localSolution) const;
- virtual RT energy (const Entity& e,
- const typename Dune::Functions::PQkNodalBasis<GridView,1>::LocalView::Tree::FiniteElement& localFiniteElement,
+ virtual RT energy (const typename Basis::LocalView& localView,
const std::vector<RigidBodyMotion<RT,3> >& localSolution) const
{
assert(localSolution.size()==2);
std::array<RigidBodyMotion<RT,3>, 2> localSolutionArray = {localSolution[0], localSolution[1]};
- return energy(e,localSolutionArray);
+ return energy(localView.element(),localSolutionArray);
}
/** \brief Assemble the element gradient of the energy functional */
--
GitLab