From d5cb47ac64f35ded2b41fa29717317afe8c3e3af Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 2 Oct 2015 17:57:40 +0200
Subject: [PATCH] Adapt to recent changes in dune-functions
---
dune/gfe/geodesicfeassembler.hh | 8 ++++----
src/cosserat-continuum.cc | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/gfe/geodesicfeassembler.hh b/dune/gfe/geodesicfeassembler.hh
index 092806bd..b8457ee6 100644
--- a/dune/gfe/geodesicfeassembler.hh
+++ b/dune/gfe/geodesicfeassembler.hh
@@ -77,7 +77,7 @@ getNeighborsPerVertex(Dune::MatrixIndexSet& nb) const
nb.resize(n, n);
// A view on the FE basis on a single element
- typename Basis::LocalView localView(&basis_);
+ auto localView = basis_.localView();
auto localIndexSet = basisIndexSet_.localIndexSet();
ElementIterator it = basis_.gridView().template begin<0,Dune::Interior_Partition>();
@@ -129,7 +129,7 @@ assembleGradientAndHessian(const std::vector<TargetSpace>& sol,
gradient = 0;
// A view on the FE basis on a single element
- typename Basis::LocalView localView(&basis_);
+ auto localView = basis_.localView();
auto localIndexSet = basisIndexSet_.localIndexSet();
ElementIterator it = basis_.gridView().template begin<0,Dune::Interior_Partition>();
@@ -186,7 +186,7 @@ assembleGradient(const std::vector<TargetSpace>& sol,
grad = 0;
// A view on the FE basis on a single element
- typename Basis::LocalView localView(&basis_);
+ auto localView = basis_.localView();
auto localIndexSet = basisIndexSet_.localIndexSet();
ElementIterator it = basis_.gridView().template begin<0,Dune::Interior_Partition>();
@@ -231,7 +231,7 @@ computeEnergy(const std::vector<TargetSpace>& sol) const
DUNE_THROW(Dune::Exception, "Coefficient vector doesn't match the function space basis!");
// A view on the FE basis on a single element
- typename Basis::LocalView localView(&basis_);
+ auto localView = basis_.localView();
auto localIndexSet = basisIndexSet_.localIndexSet();
ElementIterator it = basis_.gridView().template begin<0,Dune::Interior_Partition>();
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index 6d6b58cf..db4dafbf 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -149,9 +149,9 @@ int main (int argc, char *argv[]) try
GridView gridView = grid->leafGridView();
#ifdef SECOND_ORDER
- typedef Dune::Functions::PQKNodalBasis<typename GridType::LeafGridView, 2> FEBasis;
+ typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 2> FEBasis;
#else
- typedef Dune::Functions::PQKNodalBasis<typename GridType::LeafGridView, 1> FEBasis;
+ typedef Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> FEBasis;
#endif
FEBasis feBasis(gridView);
--
GitLab