Skip to content

Commit 7216d05

Browse files
committed
BUG: Use GMSH v2; workaround suggested by @angus-g
1 parent 739829b commit 7216d05

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

assemble/tests/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CC = @CC@
3737
CFLAGS = @CFLAGS@ -I../../include
3838

3939
CXX = @CXX@ -I../../include
40-
CXXFLAGS= @CPPFLAGS@ @CXXFLAGS@ -I../include -I../../include
40+
CXXFLAGS= @CPPFLAGS@ @CXXFLAGS@ -I../include -I../../include
4141

4242
LDFLAGS = @LDFLAGS@
4343

@@ -57,9 +57,9 @@ unittest: $(TEST_BINARIES) data
5757

5858
data:
5959
cd ../../tests/data; \
60-
gmsh -3 cube_prismatic.geo; \
60+
gmsh -format msh2 -3 cube_prismatic.geo; \
6161
../../bin/gmsh2triangle cube_prismatic.msh; \
62-
gmsh -3 cube_unstructured.geo; \
62+
gmsh -format msh2 -3 cube_unstructured.geo; \
6363
../../bin/gmsh2triangle cube_unstructured.msh; \
6464
cd -
6565

tools/gmsh2triangle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
# Header section
4747
assert mshfile.readline().strip() == "$MeshFormat"
48-
assert mshfile.readline().strip() == "4.1 0 8"
48+
assert mshfile.readline().strip() in ["2 0 8", "2.1 0 8", "2.2 0 8"]
4949
assert mshfile.readline().strip() == "$EndMeshFormat"
5050

5151
# Nodes section

0 commit comments

Comments
 (0)