From a19de82bf5de6b1bec82a95b7e02bb71c0e7f156 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sun, 29 Nov 2015 17:08:30 +0100
Subject: [PATCH] More porting from the dune-fufem bases to the dune-functions
bases
---
dune/gfe/mixedriemanniantrsolver.cc | 10 +++++-----
dune/gfe/mixedriemanniantrsolver.hh | 4 ----
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc
index 1fac797a..fd7ed282 100644
--- a/dune/gfe/mixedriemanniantrsolver.cc
+++ b/dune/gfe/mixedriemanniantrsolver.cc
@@ -6,7 +6,7 @@
#include <dune/istl/io.hh>
-#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
+#include <dune/functions/functionspacebases/pqknodalbasis.hh>
#include <dune/fufem/functionspacebases/dunefunctionsbasis.hh>
#include <dune/fufem/assemblers/operatorassembler.hh>
#include <dune/fufem/assemblers/localassemblers/laplaceassembler.hh>
@@ -197,11 +197,11 @@ setup(const GridType& grid,
{
if (numLevels>1) {
typedef typename TruncatedCompressedMGTransfer<CorrectionType0>::TransferOperatorType TransferOperatorType;
- P1NodalBasis<typename GridType::LeafGridView,double> p1Basis(grid_->leafGridView());
+ DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
TransferOperatorType pkToP1TransferMatrix;
assembleBasisInterpolationMatrix<TransferOperatorType,
- P1NodalBasis<typename GridType::LeafGridView,double>,
+ DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> >,
FufemBasis0>(pkToP1TransferMatrix,p1Basis,assembler->basis0_);
mmgStep0->mgTransfer_.back() = new TruncatedCompressedMGTransfer<CorrectionType0>;
@@ -237,11 +237,11 @@ setup(const GridType& grid,
{
if (numLevels>1) {
typedef typename TruncatedCompressedMGTransfer<CorrectionType1>::TransferOperatorType TransferOperatorType;
- P1NodalBasis<typename GridType::LeafGridView,double> p1Basis(grid_->leafGridView());
+ DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> > p1Basis(grid_->leafGridView());
TransferOperatorType pkToP1TransferMatrix;
assembleBasisInterpolationMatrix<TransferOperatorType,
- P1NodalBasis<typename GridType::LeafGridView,double>,
+ DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<typename GridType::LeafGridView,1> >,
FufemBasis1>(pkToP1TransferMatrix,p1Basis,assembler->basis1_);
mmgStep0->mgTransfer_.back() = new TruncatedCompressedMGTransfer<CorrectionType1>;
diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index 7525f782..407ecc81 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -16,10 +16,6 @@
#include <dune/solvers/solvers/loopsolver.hh>
#include <dune/solvers/iterationsteps/mmgstep.hh>
-#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
-#include <dune/fufem/functionspacebases/p2nodalbasis.hh>
-#include <dune/fufem/functionspacebases/p3nodalbasis.hh>
-
#include <dune/gfe/mixedgfeassembler.hh>
/** \brief Riemannian trust-region solver for geodesic finite-element problems */
--
GitLab