diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc index 00479169a3d0f26ac02e1d265e6d6c0222053401..7a0c801a094487f150c2d9aa3d0c0c66f486e44e 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];