From e7be69e9cb0b753607263bd99327c51b9e7a33e2 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 17 Dec 2019 18:12:08 +0100 Subject: [PATCH] FEM: gmsh, new interpolation parameter, add missing code (thanks to _UR) --- src/Mod/Fem/femmesh/gmshtools.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Mod/Fem/femmesh/gmshtools.py b/src/Mod/Fem/femmesh/gmshtools.py index 5e90e035726a..f391f79213ca 100644 --- a/src/Mod/Fem/femmesh/gmshtools.py +++ b/src/Mod/Fem/femmesh/gmshtools.py @@ -723,6 +723,17 @@ def write_geo(self): geo.write("\n") geo.write("// mesh order\n") geo.write("Mesh.ElementOrder = " + self.order + ";\n") + if self.order == "2": + if hasattr(self.mesh_obj, "SecondOrderLinear") and self.mesh_obj.SecondOrderLinear is True: + geo.write( + "Mesh.SecondOrderLinear = 1; // Second order nodes are created " + "by linear interpolation instead by curvilinear\n" + ) + else: + geo.write( + "Mesh.SecondOrderLinear = 0; // Second order nodes are created " + "by linear interpolation instead by curvilinear\n" + ) geo.write("\n") geo.write( @@ -757,16 +768,6 @@ def write_geo(self): geo.write("Coherence Mesh; // Remove duplicate vertices\n") else: geo.write("Mesh " + self.dimension + ";\n") - if hasattr(self.mesh_obj, "SecondOrderLinear") and self.mesh_obj.SecondOrderLinear is True: - geo.write( - "Mesh.SecondOrderLinear = 1; // Second order nodes are created " - "by linear interpolation instead by curvilinear\n" - ) - else: - geo.write( - "Mesh.SecondOrderLinear = 0; // Second order nodes are created " - "by linear interpolation instead by curvilinear\n" - ) geo.write("\n") # save mesh