From ed164c4188cbe46e7cf86b0985816e7359f8c5f3 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Sat, 16 Dec 2017 19:16:59 +0100 Subject: [PATCH] =?UTF-8?q?=C2=A7[vtk]=20Deprecate=20VTKMultiWriter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dumux/io/vtkmultiwriter.hh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh index a0c81a9585..ff7dd942a4 100644 --- a/dumux/io/vtkmultiwriter.hh +++ b/dumux/io/vtkmultiwriter.hh @@ -23,6 +23,8 @@ #ifndef VTK_MULTI_WRITER_HH #define VTK_MULTI_WRITER_HH +#warning "This header is deprecated. Use the new vtkoutputmodule." + #include <iostream> #include <limits> #include <list> @@ -39,6 +41,7 @@ #include <dumux/common/valgrind.hh> #include <dune/common/version.hh> +#include <dune/common/deprecated.hh> #if HAVE_MPI #include <mpi.h> @@ -54,13 +57,16 @@ namespace Dumux { * \todo This class can most likely be replaced by Dune::VTKSequenceWriter */ template<class GridView, Dune::VTK::OutputType OutputValue = Dune::VTK::ascii > -class VtkMultiWriter +class DUNE_DEPRECATED_MSG("Use VtkOutputModule instead!") VtkMultiWriter { enum { dim = GridView::dimension }; - +#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6) + typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView> VertexMapper; + typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView> ElementMapper; +#else typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper; typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper; - +#endif public: typedef Dune::VTKWriter<GridView> VtkWriter; VtkMultiWriter(const GridView &gridView, -- GitLab