From 40d4d97d4aefedf1eacc36364660d0a161fd7850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Fri, 28 Jan 2022 14:12:50 +0100 Subject: [PATCH 1/2] fix cell order --- src/pygmsh/common/geometry.py | 8 +++++--- tests/built_in/test_hole_in_square.py | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pygmsh/common/geometry.py b/src/pygmsh/common/geometry.py index 4fd3a7d3..c5bccee9 100644 --- a/src/pygmsh/common/geometry.py +++ b/src/pygmsh/common/geometry.py @@ -364,9 +364,6 @@ def generate_mesh( # noqa: C901 for entity in self._OUTWARD_NORMALS: gmsh.model.mesh.setOutwardOrientation(entity.id) - if order is not None: - gmsh.model.mesh.setOrder(order) - gmsh.option.setNumber("General.Terminal", 1 if verbose else 0) # set algorithm @@ -376,6 +373,11 @@ def generate_mesh( # noqa: C901 gmsh.model.mesh.generate(dim) + # setOrder() after generate(), see + # + if order is not None: + gmsh.model.mesh.setOrder(order) + return extract_to_meshio() def save_geometry(self, filename: str): diff --git a/tests/built_in/test_hole_in_square.py b/tests/built_in/test_hole_in_square.py index 56214875..3a8c8db9 100644 --- a/tests/built_in/test_hole_in_square.py +++ b/tests/built_in/test_hole_in_square.py @@ -24,6 +24,9 @@ def test(): xmin, xmax, ymin, ymax, 0.0, lcar, holes=[squareHole.curve_loop] ) mesh = geom.generate_mesh(order=2) + + assert "triangle6" in mesh.cells_dict + # TODO support for volumes of triangle6 # ref = 16.0 # from helpers import compute_volume From a2873b65732a1e886fe84d458683fc27b0f3e669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Fri, 28 Jan 2022 14:13:00 +0100 Subject: [PATCH 2/2] version bump --- src/pygmsh/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pygmsh/__about__.py b/src/pygmsh/__about__.py index 54e1cb45..b5f56b0b 100644 --- a/src/pygmsh/__about__.py +++ b/src/pygmsh/__about__.py @@ -1 +1 @@ -__version__ = "7.1.16" +__version__ = "7.1.17"