diff --git a/dune/vtkgridfunction.hh b/dune/vtkgridfunction.hh index b9433ad4153bc48cbfa1b8eaccf63de10cb73d9c..0b494b77864903879642b529859b97bcc2238520 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 403559f2d5230e797f2bb2a6c3a57cbca4a90deb..8fdb7c815c33b1a435222b4289c3aed9e7427a7c 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);