From 9cb731f60b0175d96df577a476251a017fb4a235 Mon Sep 17 00:00:00 2001
From: Lisa Julia Nebel <lisa_julia.nebel@tu-dresden.de>
Date: Wed, 18 Mar 2020 09:39:27 +0100
Subject: [PATCH] Adjust calls to interpolate and to
makeDiscreteGloablBasisFunction to correct syntax
---
dune/gfe/cosseratvtkwriter.hh | 8 ++++----
src/gradient-flow.cc | 2 --
src/harmonicmaps.cc | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dune/gfe/cosseratvtkwriter.hh b/dune/gfe/cosseratvtkwriter.hh
index abe48b26..ee20d468 100644
--- a/dune/gfe/cosseratvtkwriter.hh
+++ b/dune/gfe/cosseratvtkwriter.hh
@@ -31,9 +31,9 @@ class CosseratVTKWriter
v1Embedded[i] = v1[i].globalCoordinates();
// Interpolate
- auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,7> >(basis1, Dune::TypeTree::hybridTreePath(), v1Embedded);
+ auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,7> >(basis1, v1Embedded);
std::vector<Dune::FieldVector<double,7> > v2Embedded;
- Dune::Functions::interpolate(basis2, Dune::TypeTree::hybridTreePath(), v2Embedded, function);
+ Dune::Functions::interpolate(basis2, v2Embedded, function);
// Copy back from R^7 into RigidBodyMotions
v2.resize(v2Embedded.size());
@@ -51,9 +51,9 @@ class CosseratVTKWriter
v1Embedded[i] = v1[i].globalCoordinates();
// Interpolate
- auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,3> >(basis1, Dune::TypeTree::hybridTreePath(), v1Embedded);
+ auto function = Dune::Functions::makeDiscreteGlobalBasisFunction<Dune::FieldVector<double,3> >(basis1, v1Embedded);
std::vector<Dune::FieldVector<double,3> > v2Embedded;
- Dune::Functions::interpolate(basis2, Dune::TypeTree::hybridTreePath(), v2Embedded, function);
+ Dune::Functions::interpolate(basis2, v2Embedded, function);
// Copy back from FieldVector to RealTuple
v2.resize(v2Embedded.size());
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 0ada4c17..3879b56e 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -242,7 +242,6 @@ int main (int argc, char *argv[]) try
xEmbedded[i] = x[i].globalCoordinates();
auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,
- TypeTree::hybridTreePath(),
xEmbedded);
SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0));
@@ -282,7 +281,6 @@ int main (int argc, char *argv[]) try
xEmbedded[i] = x[i].globalCoordinates();
auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,
- TypeTree::hybridTreePath(),
xEmbedded);
SubsamplingVTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView(),refinementLevels(0));
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 772fc06e..3cfa8893 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -108,7 +108,7 @@ void fillVTKWriter(Writer& vtkWriter, const Basis& feBasis, const SolutionType&
}
else
{
- auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,TypeTree::hybridTreePath(),xEmbedded);
+ auto xFunction = Dune::Functions::makeDiscreteGlobalBasisFunction<TargetSpace::CoordinateType>(feBasis,xEmbedded);
vtkWriter.addVertexData(xFunction, VTK::FieldInfo("orientation", VTK::FieldInfo::Type::vector, xEmbedded[0].size()));
--
GitLab