From 74413b918153af248835c97bf043b49e2d454f5a Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 4 Oct 2018 11:37:49 +0200
Subject: [PATCH] Use a power basis for interpolation
As of version 2.6, dune-functions doesn't properly do interpolation
of vector-valued functions with scalar-valued bases anymore.
---
src/harmonicmaps.cc | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 4465041f..7ee36eaf 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -29,6 +29,7 @@
#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/functions/functionspacebases/bsplinebasis.hh>
+#include <dune/functions/functionspacebases/powerbasis.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/fufem/boundarypatch.hh>
@@ -211,10 +212,19 @@ int main (int argc, char *argv[])
auto pythonInitialIterate = Python::makeFunction<TargetSpace::CoordinateType(const FieldVector<double,dimworld>&)>(module.get("f"));
std::vector<TargetSpace::CoordinateType> v;
+ using namespace Functions::BasisFactory;
+
+ auto powerBasis = makeBasis(
+ gridView,
+ power<TargetSpace::CoordinateType::dimension>(
+ lagrange<order>(),
+ blockedInterleaved()
+ ));
+
#ifdef LAGRANGE
- Dune::Functions::interpolate(feBasis, v, pythonInitialIterate);
+ Dune::Functions::interpolate(powerBasis, v, pythonInitialIterate);
#else
- Dune::Functions::interpolate(feBasis, v, pythonInitialIterate, lower, upper, elements, order);
+ Dune::Functions::interpolate(powerBasis, v, pythonInitialIterate, lower, upper, elements, order);
#endif
for (size_t i=0; i<x.size(); i++)
--
GitLab