diff --git a/dune/fufem/assemblers/transferoperatorassembler.hh b/dune/fufem/assemblers/transferoperatorassembler.hh
index db3c97f328a1a556a2f314f47f3ed69e1585222e..16a73e9d1e97bfcb036bf5cf04c640aeb750b7c2 100644
--- a/dune/fufem/assemblers/transferoperatorassembler.hh
+++ b/dune/fufem/assemblers/transferoperatorassembler.hh
@@ -13,7 +13,7 @@
#include <dune/geometry/referenceelements.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
template <class GridType>
class MultilevelBasis
@@ -23,7 +23,7 @@ class MultilevelBasis
public:
typedef typename GridType::template Codim<0>::Entity Element;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LevelGridView, 1> > LevelBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LevelGridView, 1> > LevelBasis;
typedef typename LevelBasis::LocalFiniteElement LocalFiniteElement;
MultilevelBasis(const GridType& grid) :
diff --git a/dune/fufem/functionspacebases/p0basis.hh b/dune/fufem/functionspacebases/p0basis.hh
index f32129a57ff959992b4fc5cfa893d17071d02120..8010caccd936dabb43b4f2d4eb84a52da6abf6d0 100644
--- a/dune/fufem/functionspacebases/p0basis.hh
+++ b/dune/fufem/functionspacebases/p0basis.hh
@@ -6,7 +6,7 @@
are in the process of being replaced by counterparts in the new dune-functions module. \
Those are syntactically different, but semantically very close to the dune-fufem implementations. \
To get rid of this warning, replace all occurrences of the P0Basis<...> class in your code \
- by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,0> >.
+ by DuneFunctionsBasis<Dune::Functions::LagrangeBasis<...,0> >.
*/
/**
diff --git a/dune/fufem/functionspacebases/p1nodalbasis.hh b/dune/fufem/functionspacebases/p1nodalbasis.hh
index 8b4dac104861e0fb7237da25505ca59459f6d14b..75a35b784e62b6f402420f6a50a5b987091dbe73 100644
--- a/dune/fufem/functionspacebases/p1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p1nodalbasis.hh
@@ -6,7 +6,7 @@
are in the process of being replaced by counterparts in the new dune-functions module. \
Those are syntactically different, but semantically very close to the dune-fufem implementations. \
To get rid of this warning, replace all occurrences of the P1NodalBasis<...> class in your code \
- by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,1> >.
+ by DuneFunctionsBasis<Dune::Functions::LagrangeBasis<...,1> >.
*/
/**
diff --git a/dune/fufem/functionspacebases/p2nodalbasis.hh b/dune/fufem/functionspacebases/p2nodalbasis.hh
index 266685a6357cb021c5c32864bb465953cfa1fe79..99568ff6ab9c3b718c45a52c8d1858885cb4b069 100644
--- a/dune/fufem/functionspacebases/p2nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p2nodalbasis.hh
@@ -6,7 +6,7 @@
are in the process of being replaced by counterparts in the new dune-functions module. \
Those are syntactically different, but semantically very close to the dune-fufem implementations. \
To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \
- by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...> >.
+ by DuneFunctionsBasis<Dune::Functions::LagrangeBasis<...> >.
*/
/**
diff --git a/dune/fufem/functionspacebases/p3nodalbasis.hh b/dune/fufem/functionspacebases/p3nodalbasis.hh
index a30567d59ce6e4d0d477b6ab9025b36dc5045e46..875c0e8ad48cde67ce2ce3dae72a5fdb189ea60c 100644
--- a/dune/fufem/functionspacebases/p3nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p3nodalbasis.hh
@@ -6,7 +6,7 @@
are in the process of being replaced by counterparts in the new dune-functions module. \
Those are syntactically different, but semantically very close to the dune-fufem implementations. \
To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \
- by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,3> >.
+ by DuneFunctionsBasis<Dune::Functions::LagrangeBasis<...,3> >.
*/
/**
diff --git a/dune/fufem/functionspacebases/q1nodalbasis.hh b/dune/fufem/functionspacebases/q1nodalbasis.hh
index 77b03e0c1c619e7cf47292843b2d9fd53c10d0b1..86d1fcb65d4567e9729c79351124d5921963d303 100644
--- a/dune/fufem/functionspacebases/q1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/q1nodalbasis.hh
@@ -6,7 +6,7 @@
are in the process of being replaced by counterparts in the new dune-functions module. \
Those are syntactically different, but semantically very close to the dune-fufem implementations. \
To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \
- by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,1> >.
+ by DuneFunctionsBasis<Dune::Functions::LagrangeBasis<...,1> >.
*/
/**
diff --git a/dune/fufem/functiontools/gradientbasis.hh b/dune/fufem/functiontools/gradientbasis.hh
index 54d49c03a80f40a31063e7d50bc04762213dd53b..c04343904782023f68b7b12a33b52aa02082e740 100644
--- a/dune/fufem/functiontools/gradientbasis.hh
+++ b/dune/fufem/functiontools/gradientbasis.hh
@@ -15,7 +15,7 @@
#include <dune/fufem/functionspacebases/conformingbasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
/** \brief Provides a typedef for a basis type that can represent gradients of the given basis
*
@@ -40,8 +40,8 @@ struct GradientBasis< P1NodalBasis<GridView> >
template <class GridView>
struct GradientBasis<
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridView, 1>>> {
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridView, 0>> type;
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridView, 1>>> {
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridView, 0>> type;
};
template <class GridView>
diff --git a/dune/fufem/sampleonbitfield.hh b/dune/fufem/sampleonbitfield.hh
index 7fd2095005f7e365f021c2e19cb7f99918f1a813..ae0490191cfa06b029890335f898cf58016008b6 100644
--- a/dune/fufem/sampleonbitfield.hh
+++ b/dune/fufem/sampleonbitfield.hh
@@ -10,7 +10,7 @@
#include <dune/common/version.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functions/basisgridfunction.hh>
@@ -39,7 +39,7 @@ void sampleOnBitField(const GridType& grid,
// Construct GridFunction
typename GridType::LevelGridView levelView = grid.levelGridView(0);
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LevelGridView, 1> DuneP1Basis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LevelGridView, 1> DuneP1Basis;
DuneP1Basis duneP1Basis(levelView);
typedef DuneFunctionsBasis<DuneP1Basis> P1Basis;
P1Basis p1Basis(duneP1Basis);
@@ -114,7 +114,7 @@ void sampleOnBitField(const GridType& grid,
assert((int) coarseDirichletValues.size()==grid.size(0,dim));
// Construct GridFunction
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LevelGridView, 1> DuneP1Basis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LevelGridView, 1> DuneP1Basis;
DuneP1Basis duneP1Basis(grid.levelGridView(0));
typedef DuneFunctionsBasis<DuneP1Basis> P1Basis;
P1Basis p1Basis(duneP1Basis);
@@ -181,7 +181,7 @@ void sampleOnBitField(const GridType& grid,
assert((int) coarseDirichletValues.size()==grid.size(0,dim));
// Construct GridFunction
- typedef Dune::Functions::PQkNodalBasis<typename GridType::LevelGridView,1> DuneP1Basis;
+ typedef Dune::Functions::LagrangeBasis<typename GridType::LevelGridView,1> DuneP1Basis;
DuneP1Basis duneP1Basis(grid.levelGridView(0));
typedef DuneFunctionsBasis<DuneP1Basis> P1Basis;
P1Basis p1Basis(duneP1Basis);
diff --git a/dune/fufem/test/adolctest.cc b/dune/fufem/test/adolctest.cc
index f296423add2be10370c7b175f6913809b33fd286..63a602a76225300fd9d43549108e010fb687a240 100644
--- a/dune/fufem/test/adolctest.cc
+++ b/dune/fufem/test/adolctest.cc
@@ -29,7 +29,7 @@
#include <dune/fufem/makesphere.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
//! Local energy for a geometric exact St. Venant--Kirchhoff material
template <class GridType, class LocalFiniteElement>
@@ -173,7 +173,7 @@ int main (int argc, char *argv[])
typedef GridType::LeafGridView GridView;
GridView gridView = grid->leafGridView();
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridView, 1> > FEBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridView, 1> > FEBasis;
FEBasis feBasis(gridView);
// //////////////////////////
diff --git a/dune/fufem/test/basisgridfunctiontest.cc b/dune/fufem/test/basisgridfunctiontest.cc
index f1f8f47397e8cfbb3b8a80e92eacd884571ac52c..89a7ab208c3640657c6f9eb3ce185088a36d7c13 100644
--- a/dune/fufem/test/basisgridfunctiontest.cc
+++ b/dune/fufem/test/basisgridfunctiontest.cc
@@ -15,7 +15,7 @@
#include <dune/fufem/functiontools/basisinterpolator.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -63,7 +63,7 @@ struct BasisGridFunctionTestSuite
// Test with a P1 basis
{
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridView, 1> > P1Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridView, 1> > P1Basis;
typedef ConformingBasis<P1Basis> ConformingP1Basis;
P1Basis p1Basis(gridView);
diff --git a/dune/fufem/test/basisinterpolatortest.cc b/dune/fufem/test/basisinterpolatortest.cc
index a817046fe968e379254555a32c5d6b32a5f3c245..c2cb5e5e3c81c80f61b30f4702eb5003570b17a1 100644
--- a/dune/fufem/test/basisinterpolatortest.cc
+++ b/dune/fufem/test/basisinterpolatortest.cc
@@ -6,7 +6,7 @@
#include <dune/fufem/functiontools/basisinterpolator.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -60,7 +60,7 @@ struct Suite
RT y0;
f.evaluate(x0, y0);
- DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > basis(grid.leafGridView());
+ DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > basis(grid.leafGridView());
Functions::interpolate(basis, v, f);
bool passed = (v.size() == basis.size());
diff --git a/dune/fufem/test/coarsegridfunctionwrappertest.cc b/dune/fufem/test/coarsegridfunctionwrappertest.cc
index e137c098895b640853ac913ddbeadfd071478c37..9d6b25e749eb2850c837f8b6ed17672a5dd45e22 100644
--- a/dune/fufem/test/coarsegridfunctionwrappertest.cc
+++ b/dune/fufem/test/coarsegridfunctionwrappertest.cc
@@ -7,7 +7,7 @@
#include <dune/fufem/functiontools/basisinterpolator.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -41,11 +41,11 @@ struct CoarseGridFunctionWrapperTestSuite
typedef typename Dune::BlockVector<RangeType> Vector;
typedef typename GridType::LevelGridView CoarseGridView;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<CoarseGridView, 1> > CoarseBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<CoarseGridView, 1> > CoarseBasis;
typedef BasisGridFunction<CoarseBasis, Vector> CoarseGridFunction;
typedef typename GridType::LeafGridView FineGridView;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<FineGridView, 1> > FineBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<FineGridView, 1> > FineBasis;
typedef BasisGridFunction<FineBasis, Vector> FineGridFunction;
typedef CoarseGridFunctionWrapper<CoarseGridFunction> WrappedCoarseGridFunction;
diff --git a/dune/fufem/test/functionspacebasistest.cc b/dune/fufem/test/functionspacebasistest.cc
index 98c2d2470a2a935ecca4a9d173888a799c4ee10c..32aec4d198dfda99205b698f44ef6b41470ef53e 100644
--- a/dune/fufem/test/functionspacebasistest.cc
+++ b/dune/fufem/test/functionspacebasistest.cc
@@ -11,7 +11,7 @@
#include <dune/grid/utility/structuredgridfactory.hh>
#include <doc/grids/gridfactory/hybridtestgrids.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
@@ -119,14 +119,14 @@ struct FunctionSpaceBasisTestSuite
P2NodalBasis<LeafView> p2NodalBasis(leafView);
passed = passed and testNodalBasis(p2NodalBasis);
- DuneFunctionsBasis<typename Functions::PQkNodalBasis<LeafView,1> > fufemFunctionsPQk1NodalBasis(leafView);
+ DuneFunctionsBasis<typename Functions::LagrangeBasis<LeafView,1> > fufemFunctionsPQk1NodalBasis(leafView);
passed = passed and testNodalBasis(fufemFunctionsPQk1NodalBasis);
- DuneFunctionsBasis<typename Functions::PQkNodalBasis<LeafView,2> > fufemFunctionsPQk2NodalBasis(leafView);
+ DuneFunctionsBasis<typename Functions::LagrangeBasis<LeafView,2> > fufemFunctionsPQk2NodalBasis(leafView);
passed = passed and testNodalBasis(fufemFunctionsPQk2NodalBasis);
try {
- DuneFunctionsBasis<typename Functions::PQkNodalBasis<LeafView,3> > fufemFunctionsPQk3NodalBasis(leafView);
+ DuneFunctionsBasis<typename Functions::LagrangeBasis<LeafView,3> > fufemFunctionsPQk3NodalBasis(leafView);
passed = passed and testNodalBasis(fufemFunctionsPQk3NodalBasis);
} catch (Dune::NotImplemented e) {
std::cout << e << std::endl;
diff --git a/dune/fufem/test/generalizedlaplaceassemblertest.cc b/dune/fufem/test/generalizedlaplaceassemblertest.cc
index 52ccc1beedb95b02d1fa600f688f9a7c31357759..fe0abd2fbc854995de7cf2f04c98e21a8721951b 100644
--- a/dune/fufem/test/generalizedlaplaceassemblertest.cc
+++ b/dune/fufem/test/generalizedlaplaceassemblertest.cc
@@ -19,7 +19,7 @@
#include <dune/fufem/assemblers/localassemblers/generalizedlaplaceassembler.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -97,7 +97,7 @@ struct GeneralizedLaplaceAssemblerTestSuite
const int dim = GridType::dimension;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > Basis;
typedef typename Basis::LocalFiniteElement FE;
Basis basis(grid.leafGridView());
diff --git a/dune/fufem/test/gradientassemblertest.cc b/dune/fufem/test/gradientassemblertest.cc
index 41f823c66b60f1d3469abf1e4758d1ec5c5a9cbb..2e747a828b3897ebf3a87eb07c595f315674937f 100644
--- a/dune/fufem/test/gradientassemblertest.cc
+++ b/dune/fufem/test/gradientassemblertest.cc
@@ -18,7 +18,7 @@
#include <dune/fufem/functiontools/gradientbasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -36,7 +36,7 @@ struct GradientAssemblerTestSuite
{
const int dim = GridType::dimension;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > Basis;
typedef typename Basis::LocalFiniteElement FE;
Basis basis(grid.leafGridView());
diff --git a/dune/fufem/test/gridfunctionadaptortest.cc b/dune/fufem/test/gridfunctionadaptortest.cc
index 5bb66a51ed72e3ee9316bfb36ada733acb5bac6e..6b9df14010bb13412f986c9561c5a0bdf768bcf6 100644
--- a/dune/fufem/test/gridfunctionadaptortest.cc
+++ b/dune/fufem/test/gridfunctionadaptortest.cc
@@ -8,7 +8,7 @@
#include <dune/fufem/functionspacebases/conformingbasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -37,7 +37,7 @@ struct Suite
{
const int dim = GridType::dimensionworld;
typedef typename GridType::LeafGridView View;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<View, 1> > NonconformingBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<View, 1> > NonconformingBasis;
typedef ConformingBasis<NonconformingBasis> Basis;
typedef Dune::BlockVector<RT> Vector;
diff --git a/dune/fufem/test/h1functionalassemblertest.cc b/dune/fufem/test/h1functionalassemblertest.cc
index 1d8013f9c433d1e6f26ae263e38c89be4a2204d4..51f849770572000165fbb89a5f6dd6bac3ac4ba7 100644
--- a/dune/fufem/test/h1functionalassemblertest.cc
+++ b/dune/fufem/test/h1functionalassemblertest.cc
@@ -18,7 +18,7 @@
#include <dune/fufem/assemblers/localassemblers/h1functionalassembler.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -69,7 +69,7 @@ struct H1FunctionalAssemblerTestSuite
template <typename GridType>
bool check(const GridType& grid)
{
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > Basis;
typedef typename Basis::LocalFiniteElement FE;
const int block_size=2;
diff --git a/dune/fufem/test/integraloperatorassemblertest.cc b/dune/fufem/test/integraloperatorassemblertest.cc
index 45eb223ceb7f14fc0f2c76abb815ad110376c52d..71bb079f042acd34f04d86a0053b41d07b27aac4 100644
--- a/dune/fufem/test/integraloperatorassemblertest.cc
+++ b/dune/fufem/test/integraloperatorassemblertest.cc
@@ -7,7 +7,7 @@
#include <dune/fufem/assemblers/localassemblers/convolutionassembler.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -53,7 +53,7 @@ struct IntegralOperatorAssemblerTestSuite
Mollifier<dim> m(0.1);
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > Basis;
Basis basis(grid.leafGridView());
typename Dune::Matrix<Dune::FieldMatrix<double,1,1> > M1, M2;
diff --git a/dune/fufem/test/laplaceassemblertest.cc b/dune/fufem/test/laplaceassemblertest.cc
index b7785fdee6e45f8bb1fb970721cb1db3a12d7913..e9e5a430b4638bf0a307b07d8ea6a5e631a25376 100644
--- a/dune/fufem/test/laplaceassemblertest.cc
+++ b/dune/fufem/test/laplaceassemblertest.cc
@@ -12,7 +12,7 @@
#include <dune/fufem/assemblers/boundaryoperatorassembler.hh>
#include <dune/fufem/assemblers/localassemblers/laplaceassembler.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
using namespace Dune;
@@ -31,7 +31,7 @@ int main (int argc, char *argv[])
GridType grid(h,n);
// Construct a function space basis for the grid
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridType::LeafGridView, 1> > P1Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridType::LeafGridView, 1> > P1Basis;
P1Basis p1Basis(grid.leafGridView());
// Construct a boundary patch for the entire grid boundary
diff --git a/dune/fufem/test/newpfeassemblertest.cc b/dune/fufem/test/newpfeassemblertest.cc
index 690483df40457ec3c1f4b8b9d5b78fc32c7de776..b1484020cbfbe943132b72beace1266a63fd3b81 100644
--- a/dune/fufem/test/newpfeassemblertest.cc
+++ b/dune/fufem/test/newpfeassemblertest.cc
@@ -12,7 +12,7 @@
#include <dune/fufem/mechanics/tetratensor.hh>
#include <dune/fufem/test/common.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
template <int n>
struct eigenStrainComputer {
@@ -71,7 +71,7 @@ void runTest() {
using GridView = typename Grid::LeafGridView;
- using Basis = DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridView, 1> >;
+ using Basis = DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridView, 1> >;
using LocalBasis = typename Basis::LocalFiniteElement;
using Function = BasisGridFunction<Basis, Vector>;
diff --git a/dune/fufem/test/secondorderassemblertest.cc b/dune/fufem/test/secondorderassemblertest.cc
index a4eab1eb12616b4b6fb890dab9189ca260394485..fcec8d25984e66d62d7b99fb16f0f44fe910bfd0 100644
--- a/dune/fufem/test/secondorderassemblertest.cc
+++ b/dune/fufem/test/secondorderassemblertest.cc
@@ -25,7 +25,7 @@
#include <dune/fufem/assemblers/localassemblers/variablecoefficientviscosityassembler.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
template<class Matrix1, class Matrix2>
bool compare(const Matrix1& matrix1, const Matrix2& matrix2)
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
grid.globalRefine(refine);
// Construct a function space basis for the grid
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<GridType::LeafGridView, 1> > P1Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<GridType::LeafGridView, 1> > P1Basis;
P1Basis p1Basis(grid.leafGridView());
OperatorAssembler<P1Basis,P1Basis> globalAssembler(p1Basis, p1Basis);
diff --git a/dune/fufem/test/subgridxyfunctionalassemblertest.cc b/dune/fufem/test/subgridxyfunctionalassemblertest.cc
index 1ca08a163d1d2d505a742609e642c112d1a8dad6..ea7f58905ae9f17f273f835d03d2db3403ff287c 100644
--- a/dune/fufem/test/subgridxyfunctionalassemblertest.cc
+++ b/dune/fufem/test/subgridxyfunctionalassemblertest.cc
@@ -20,7 +20,7 @@
#endif
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/fufem/functionspacebases/conformingbasis.hh>
@@ -193,8 +193,8 @@ struct SubgridL2FunctionalAssemblerTestSuite
static const int block_size=2;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > NCBasis;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename HostGridType::LeafGridView, 1> > NCHostBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > NCBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename HostGridType::LeafGridView, 1> > NCHostBasis;
typedef ConformingBasis<NCBasis> Basis;
typedef ConformingBasis<NCHostBasis> HostBasis;
typedef Dune::BCRSMatrix<Dune::FieldMatrix<double,block_size,block_size> > Transfer;
@@ -287,8 +287,8 @@ struct SubgridH1FunctionalAssemblerTestSuite
static const int block_size=1;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> > NCBasis;
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename HostGridType::LeafGridView, 1> > NCHostBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> > NCBasis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename HostGridType::LeafGridView, 1> > NCHostBasis;
typedef ConformingBasis<NCBasis> Basis;
typedef ConformingBasis<NCHostBasis> HostBasis;
typedef Dune::BCRSMatrix<Dune::FieldMatrix<double,block_size,block_size> > Transfer;
diff --git a/dune/fufem/test/sumfunctiontest.cc b/dune/fufem/test/sumfunctiontest.cc
index 9713f8738971b7a9b230bc429de4d5500217e588..4ecd69480a0cc4bcfa8b6744c6b49317ba7a600f 100644
--- a/dune/fufem/test/sumfunctiontest.cc
+++ b/dune/fufem/test/sumfunctiontest.cc
@@ -17,7 +17,7 @@
#include <dune/fufem/functiontools/basisinterpolator.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include "common.hh"
@@ -147,7 +147,7 @@ struct SumGridFunctionTestSuite
TFType cos2x(0,TFType::COS);
TFType cos2y(1,TFType::COS);
- typedef DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1 > > Basis;
+ typedef DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView,1 > > Basis;
Basis basis(grid.leafGridView());
typedef Dune::BlockVector<RangeType> CoeffType;
diff --git a/dune/fufem/utilities/dirichletbcassembler.hh b/dune/fufem/utilities/dirichletbcassembler.hh
index 760fc802f23e244d80bfe6bafd4bd6275ef432b8..59882a2f12719fbd2f5d6bffde35ae26f52f6d8c 100644
--- a/dune/fufem/utilities/dirichletbcassembler.hh
+++ b/dune/fufem/utilities/dirichletbcassembler.hh
@@ -14,7 +14,7 @@
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
#include <dune/fufem/utilities/boundarypatchfactory.hh>
-#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/grid/io/file/amirameshreader.hh>
@@ -199,10 +199,10 @@ void DirichletBCAssembler<GridType>::assembleDirichletBC(const GridType& grid,
DirichletBCAssembler::template assembleDirichletBC<ncomp, mcomp, Enable>(grid, coarseDirichletNodes, leafDirichletNodes);
// make a nodal bases function
- using P1Basis = DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1> >;
+ using P1Basis = DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LeafGridView, 1> >;
P1Basis p1Basis(grid.leafGridView());
- using CoarseP1Basis = DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LevelGridView, 1> >;
+ using CoarseP1Basis = DuneFunctionsBasis<Dune::Functions::LagrangeBasis<typename GridType::LevelGridView, 1> >;
CoarseP1Basis coarseP1(grid.levelGridView(0));
//////////////////////////////////////////