From 27fd07fb644bd186f5a62330a7c4e2d8e3fc2b56 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Wed, 30 Aug 2017 18:58:14 +0200 Subject: [PATCH] Revert "[bugfix][vtk] NestedFunction always needs an element mapper" This was simply wrong. However NestedVtkFunction currently doesn't compile if the mapper is a singlegeomtype mapper as it doesn't allow mapping elements due to a static_assert. This reverts commit e7e9c71d0865d2bfd1ad6c1d3ffcf5ea30bdfd3f. --- dumux/io/vtkoutputmodulebase.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dumux/io/vtkoutputmodulebase.hh b/dumux/io/vtkoutputmodulebase.hh index 2974a7b109..d299d2b9a8 100644 --- a/dumux/io/vtkoutputmodulebase.hh +++ b/dumux/io/vtkoutputmodulebase.hh @@ -289,10 +289,10 @@ public: { if (isBox && dim > 1) { - using NestedFunction = VtkNestedFunction<GridView, ElementMapper, std::vector<GlobalPosition>>; + using NestedFunction = VtkNestedFunction<GridView, VertexMapper, std::vector<GlobalPosition>>; for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) sequenceWriter_.addVertexData(std::make_shared<NestedFunction>("velocity_" + std::string(FluidSystem::phaseName(phaseIdx)) + " (m/s)", - problem_.gridView(), problem_.elementMapper(), + problem_.gridView(), problem_.vertexMapper(), velocity[phaseIdx], dim, dimWorld)); } // cell-centered models @@ -332,9 +332,9 @@ public: } else if (field.first.size() == std::size_t(problem_.gridView().size(dim))) { - using NestedFunction = VtkNestedFunction<GridView, ElementMapper, std::vector<GlobalPosition>>; + using NestedFunction = VtkNestedFunction<GridView, VertexMapper, std::vector<GlobalPosition>>; sequenceWriter_.addVertexData(std::make_shared<NestedFunction>(field.second, - problem_.gridView(), problem_.elementMapper(), + problem_.gridView(), problem_.vertexMapper(), field.first, dim, dimWorld)); } else -- GitLab