From a2d008129bc3e371102b39defb95c026c8bf23fc Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sun, 6 Sep 2020 15:35:59 +0200
Subject: [PATCH 1/2] Add Vtk reader and Gmsh4 reader

---
 amdis/MeshCreator.hpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/amdis/MeshCreator.hpp b/amdis/MeshCreator.hpp
index 5649dfa0..77f16fbc 100644
--- a/amdis/MeshCreator.hpp
+++ b/amdis/MeshCreator.hpp
@@ -12,9 +12,20 @@
 #if HAVE_ALBERTA
 #include <dune/grid/albertagrid/albertareader.hh>
 #endif
+
 #include <dune/grid/io/file/gmshreader.hh>
 #include <dune/grid/utility/structuredgridfactory.hh>
 
+#if HAVE_DUNE_VTK
+#include <dune/vtk/vtkreader.hh>
+#include <dune/vtk/gridcreators/lagrangegridcreator.hh>
+#endif
+
+#if HAVE_DUNE_GMSH4
+#include <dune/gmsh4/gmsh4reader.hh>
+#include <dune/gmsh4/gridcreators/lagrangegridcreator.hh>
+#endif
+
 #include <amdis/AdaptiveGrid.hpp>
 #include <amdis/Initfile.hpp>
 #include <amdis/Output.hpp>
@@ -166,7 +177,16 @@ namespace AMDiS
       auto ext = fn.extension();
 
       if (ext == ".msh") {
+#if HAVE_DUNE_GMSH4
+        if (Dune::Gmsh4::fileVersion(filename)[0] >= 4)
+          return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
+        else
+#else
         return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
+#endif
+      }
+      else if (ext == ".vtu") {
+        return Dune::VtkReader<HostGrid, Dune::Vtk::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
       }
       else if (ext == ".1d" || ext == ".2d" || ext == ".3d" || ext == ".amc") {
         return read_alberta_file<HostGrid>(filename, Dune::PriorityTag<42>{});
-- 
GitLab


From 103e3026f6a85c836c964022e5f5910e469f52ff Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sun, 6 Sep 2020 15:54:04 +0200
Subject: [PATCH 2/2] add preprocessor protection

---
 amdis/MeshCreator.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/amdis/MeshCreator.hpp b/amdis/MeshCreator.hpp
index 77f16fbc..080b2838 100644
--- a/amdis/MeshCreator.hpp
+++ b/amdis/MeshCreator.hpp
@@ -185,9 +185,11 @@ namespace AMDiS
         return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
 #endif
       }
+#if HAVE_DUNE_VTK
       else if (ext == ".vtu") {
         return Dune::VtkReader<HostGrid, Dune::Vtk::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
       }
+#endif
       else if (ext == ".1d" || ext == ".2d" || ext == ".3d" || ext == ".amc") {
         return read_alberta_file<HostGrid>(filename, Dune::PriorityTag<42>{});
       }
-- 
GitLab