From ad65719300e983515cc1710b67b4afcf7ef294f0 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 7 Nov 2011 18:14:36 +0100
Subject: [PATCH] Use vtkgridfunction from dune-fufem
---
dune/vtkgridfunction.hh | 2 --
src/one-body-sample.cc | 11 +++++------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dune/vtkgridfunction.hh b/dune/vtkgridfunction.hh
index b9433ad4..0b494b77 100644
--- a/dune/vtkgridfunction.hh
+++ b/dune/vtkgridfunction.hh
@@ -5,7 +5,6 @@
#include <dune/grid/io/file/vtk/function.hh>
-namespace Dune {
/** \brief A VTK basis grid function.
*
* This function "evaluates" by evaluating the global basis and
@@ -75,5 +74,4 @@ class VTKBasisGridFunction : public VTKFunction<typename Basis::GridView> {
const CoefficientType &coeffs_;
std::string s_;
};
-}
#endif
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 403559f2..8fdb7c81 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -30,6 +30,7 @@
#include <dune/fufem/boundarypatch.hh>
#include <dune/fufem/functions/basisgridfunction.hh>
#include <dune/fufem/functions/constantfunction.hh>
+#include <dune/fufem/functions/vtkbasisgridfunction.hh>
#include <dune/fufem/functionspacebases/p0basis.hh>
#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
#include <dune/solvers/common/numproc.hh> // Solver::FULL
@@ -38,8 +39,6 @@
#include <dune/solvers/solvers/loopsolver.hh>
#include <dune/tnnmg/iterationsteps/genericnonlineargs.hh>
-#include <dune/vtkgridfunction.hh> // currently homeless
-
#include <dune/tectonic/globalnonlinearity.hh>
#include <dune/tectonic/myconvexproblem.hh>
#include <dune/tectonic/myblockproblem.hh>
@@ -245,11 +244,11 @@ int main() {
{
Dune::VTKWriter<GridType::LeafGridView> writer(leafView);
std::string filename((boost::format("obs%d") % run).str());
- Dune::shared_ptr<Dune::VTKBasisGridFunction<P1Basis, VectorType>>
- displacement_ptr(new Dune::VTKBasisGridFunction<P1Basis, VectorType>(
+ Dune::shared_ptr<VTKBasisGridFunction<P1Basis, VectorType>>
+ displacement_ptr(new VTKBasisGridFunction<P1Basis, VectorType>(
p1Basis, u1, "displacement"));
- Dune::shared_ptr<Dune::VTKBasisGridFunction<P0Basis, CellVectorType>>
- vonmises_ptr(new Dune::VTKBasisGridFunction<P0Basis, CellVectorType>(
+ Dune::shared_ptr<VTKBasisGridFunction<P0Basis, CellVectorType>>
+ vonmises_ptr(new VTKBasisGridFunction<P0Basis, CellVectorType>(
p0Basis, vonMisesStress, "stress"));
writer.addVertexData(displacement_ptr);
writer.addCellData(vonmises_ptr);
--
GitLab