removed usage of PQ1NodalBasis, changed to PQkNodalBasis<.., 1>

dune/elasticity/common/trustregionsolver.cc

@@ -3,7 +3,6 @@
 
 #include <dune/istl/io.hh>
 
-#include <dune/functions/functionspacebases/pq1nodalbasis.hh>
 #include <dune/functions/functionspacebases/pqknodalbasis.hh>
 
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
@@ -152,8 +151,7 @@ setup(const typename BasisType::GridView::Grid& grid,
     ////////////////////////////////////////////////////////////////////////
 
     typedef BasisType Basis;
-    bool isP1Basis = std::is_same<Basis,DuneFunctionsBasis<Dune::Functions::PQ1NodalBasis<typename Basis::GridView> > >::value
-                  || std::is_same<Basis,DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename Basis::GridView, 1> > >::value;
+    bool isP1Basis = std::is_same<Basis,DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename Basis::GridView, 1> > >::value;
 
     
     using TransferOperatorType = typename TruncatedCompressedMGTransfer<CorrectionType>::TransferOperatorType;

viscoelast.cc

@@ -29,8 +29,6 @@
 #include <dune/fufem/functiontools/gridfunctionadaptor.hh>
 #include <dune/fufem/utilities/dirichletbcassembler.hh>
 
-#include <dune/functions/functionspacebases/pq1nodalbasis.hh>
-
 
 /** Solver for a quasi-static (viscoelastic) Kelvin-Voigt material
  *
@@ -154,7 +152,7 @@ int main (int argc, char *argv[]) try {
 
     MatrixType elasticPart,viscousPart;
 
-    using DuneP1Basis  = Dune::Functions::PQ1NodalBasis<typename GridType::LeafGridView>;
+    using DuneP1Basis  = Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView, 1>;
     using P1Basis = DuneFunctionsBasis<DuneP1Basis>;
     P1Basis p1Basis(grid->leafGridView());
     OperatorAssembler<P1Basis,P1Basis> globalAssembler(p1Basis,p1Basis);