From 537c2f1c60ddb9fb59b0fd640ec892887f6ee906 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 29 Sep 2018 20:25:17 +0200
Subject: [PATCH] Use LagrangeBasis instead of PQkNodalBasis
The latter is deprecated in dune-functions 2.6.
---
dune/elasticity/common/trustregionsolver.cc | 4 ++--
src/finite-strain-elasticity.cc | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dune/elasticity/common/trustregionsolver.cc b/dune/elasticity/common/trustregionsolver.cc
index 9121a70..ca56c3b 100644
--- a/dune/elasticity/common/trustregionsolver.cc
+++ b/dune/elasticity/common/trustregionsolver.cc
@@ -3,7 +3,7 @@
#include <dune/istl/io.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
#include <dune/fufem/assemblers/operatorassembler.hh>
@@ -151,7 +151,7 @@ setup(const typename BasisType::GridView::Grid& grid,
////////////////////////////////////////////////////////////////////////
typedef BasisType Basis;
- bool isP1Basis = std::is_same<Basis,DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename Basis::GridView, 1> > >::value;
+ bool isP1Basis = std::is_same<Basis,DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename Basis::GridView, 1> > >::value;
using TransferOperatorType = typename TruncatedCompressedMGTransfer<CorrectionType>::TransferOperatorType;
diff --git a/src/finite-strain-elasticity.cc b/src/finite-strain-elasticity.cc
index 98e51a9..5eea681 100644
--- a/src/finite-strain-elasticity.cc
+++ b/src/finite-strain-elasticity.cc
@@ -18,7 +18,6 @@
#include <dune/grid/io/file/gmshreader.hh>
#include <dune/grid/io/file/vtk.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
@@ -144,7 +143,7 @@ int main (int argc, char *argv[]) try
GridView gridView = grid->leafGridView();
// FE basis spanning the FE space that we are working in
- typedef Dune::Functions::PQkNodalBasis<GridView, 2> FEBasis;
+ typedef Dune::Functions::LagrangeBasis<GridView, order> FEBasis;
FEBasis feBasis(gridView);
// dune-fufem-style FE basis for the transition from dune-fufem to dune-functions
--
GitLab