From f1b437c9a151043ab2cb6b8822efe3ed1fade7cb Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 16 May 2019 16:52:57 +0200
Subject: [PATCH] Remove the B-spline code from harmonicmaps.cc
It does not look like that code is used anytime soon, so let's get rid
of it for the sake of tidyness.
---
src/harmonicmaps.cc | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 00479169..7a0c801a 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -28,7 +28,6 @@
#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>
@@ -71,8 +70,6 @@ const int blocksize = TargetSpace::TangentVector::dimension;
const int order = 1;
-#define LAGRANGE
-
using namespace Dune;
template <typename Writer, typename Basis, typename SolutionType>
@@ -151,9 +148,7 @@ int main (int argc, char *argv[])
// read problem settings
const int numLevels = parameterSet.get<int>("numLevels");
-#ifndef LAGRANGE
- const int order = parameterSet.get<int>("order");
-#endif
+
// read solver settings
const double tolerance = parameterSet.get<double>("tolerance");
const int maxTrustRegionSteps = parameterSet.get<int>("maxTrustRegionSteps");
@@ -211,15 +206,9 @@ int main (int argc, char *argv[])
using GridView = GridType::LeafGridView;
GridView gridView = grid->leafGridView();
-#ifdef LAGRANGE
+
typedef Dune::Functions::LagrangeBasis<GridView, order> FEBasis;
FEBasis feBasis(gridView);
-#else
- typedef Dune::Functions::BSplineBasis<GridView> FEBasis;
- for (auto& i : elements)
- i = i<<(numLevels-1);
- FEBasis feBasis(gridView, lower, upper, elements, order);
-#endif
SolutionType x(feBasis.size());
// /////////////////////////////////////////
@@ -268,11 +257,7 @@ int main (int argc, char *argv[])
blockedInterleaved()
));
-#ifdef LAGRANGE
Dune::Functions::interpolate(powerBasis, v, pythonInitialIterate);
-#else
- Dune::Functions::interpolate(powerBasis, v, pythonInitialIterate, lower, upper, elements, order);
-#endif
for (size_t i=0; i<x.size(); i++)
x[i] = v[i];
--
GitLab