Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
amdis
amdis-core
Commits
b340f21a
Commit
b340f21a
authored
Nov 12, 2020
by
Praetorius, Simon
Browse files
Merge branch 'fix/gmshreader' into 'master'
Fix gmsh reader in MeshCreator See merge request
!237
parents
d48257d1
9bfbcd7a
Changes
1
Hide whitespace changes
Inline
Side-by-side
amdis/MeshCreator.hpp
View file @
b340f21a
...
...
@@ -24,6 +24,7 @@
#if HAVE_DUNE_GMSH4
#include
<dune/gmsh4/gmsh4reader.hh>
#include
<dune/gmsh4/gridcreators/lagrangegridcreator.hh>
#include
<dune/gmsh4/utility/version.hh>
#endif
#include
<amdis/AdaptiveGrid.hpp>
...
...
@@ -187,9 +188,8 @@ namespace AMDiS
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
return
read_gmsh_file
<
HostGrid
>
(
filename
,
Dune
::
PriorityTag
<
42
>
{});
}
#if HAVE_DUNE_VTK
else
if
(
ext
==
".vtu"
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment