Commit b340f21a authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'fix/gmshreader' into 'master'

Fix gmsh reader in MeshCreator

See merge request !237
parents d48257d1 9bfbcd7a
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#if HAVE_DUNE_GMSH4 #if HAVE_DUNE_GMSH4
#include <dune/gmsh4/gmsh4reader.hh> #include <dune/gmsh4/gmsh4reader.hh>
#include <dune/gmsh4/gridcreators/lagrangegridcreator.hh> #include <dune/gmsh4/gridcreators/lagrangegridcreator.hh>
#include <dune/gmsh4/utility/version.hh>
#endif #endif
#include <amdis/AdaptiveGrid.hpp> #include <amdis/AdaptiveGrid.hpp>
...@@ -187,9 +188,8 @@ namespace AMDiS ...@@ -187,9 +188,8 @@ namespace AMDiS
if (Dune::Gmsh4::fileVersion(filename)[0] >= 4) if (Dune::Gmsh4::fileVersion(filename)[0] >= 4)
return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename); return Dune::Gmsh4Reader<HostGrid, Dune::Gmsh4::LagrangeGridCreator<HostGrid>>::createGridFromFile(filename);
else else
#else
return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
#endif #endif
return read_gmsh_file<HostGrid>(filename, Dune::PriorityTag<42>{});
} }
#if HAVE_DUNE_VTK #if HAVE_DUNE_VTK
else if (ext == ".vtu") { else if (ext == ".vtu") {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment