From 6ada09b1c01726e5401382d7be2bae73d3083686 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 28 Jan 2015 20:20:02 +0000
Subject: [PATCH] Switch to a P2NodalBasis, and make that work properly
[[Imported from SVN: r10037]]
---
src/harmonicmaps.cc | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index df0abdfc..a09de7da 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -21,6 +21,7 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functions/vtkbasisgridfunction.hh>
#include <dune/fufem/functiontools/basisinterpolator.hh>
+#include <dune/fufem/functiontools/boundarydofs.hh>
#include <dune/fufem/discretizationerror.hh>
#include <dune/fufem/dunepython.hh>
@@ -120,7 +121,14 @@ int main (int argc, char *argv[]) try
grid->globalRefine(numLevels-1);
- SolutionType x(grid->size(dim));
+ //////////////////////////////////////////////////////////////////////////////////
+ // Construct the scalar function space basis corresponding to the GFE space
+ //////////////////////////////////////////////////////////////////////////////////
+
+ typedef P2NodalBasis<typename GridType::LeafGridView,double> FEBasis;
+ FEBasis feBasis(grid->leafGridView());
+
+ SolutionType x(feBasis.size());
// /////////////////////////////////////////
// Read Dirichlet values
@@ -128,19 +136,15 @@ int main (int argc, char *argv[]) try
BitSetVector<1> allNodes(grid->size(dim));
allNodes.setAll();
- BoundaryPatch<GridType::LeafGridView> dirichletBoundary(grid->leafGridView(), allNodes);
+ BoundaryPatch<typename GridType::LeafGridView> dirichletBoundary(grid->leafGridView(), allNodes);
- BitSetVector<blocksize> dirichletNodes(grid->size(dim));
- for (size_t i=0; i<dirichletNodes.size(); i++)
- dirichletNodes[i] = dirichletBoundary.containsVertex(i);
+ BitSetVector<blocksize> dirichletNodes;
+ constructBoundaryDofs(dirichletBoundary,feBasis,dirichletNodes);
// //////////////////////////
// Initial iterate
// //////////////////////////
- typedef P1NodalBasis<typename GridType::LeafGridView,double> FEBasis;
- FEBasis feBasis(grid->leafGridView());
-
std::string lambda = std::string("lambda x: (") + parameterSet.get<std::string>("initialIterate") + std::string(")");
PythonFunction<FieldVector<double,dim>, TargetSpace::CoordinateType > pythonInitialIterate(Python::evaluate(lambda));
--
GitLab