From cab9145a814bd1ee1fa9321618c70c9dd602d9f0 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 2 Sep 2019 19:45:37 +0200 Subject: [PATCH] FEM: gmsh tools, fix writing groups and reactivate unit test for solve frame work --- src/Mod/Fem/TestFem.py | 4 ++-- src/Mod/Fem/femmesh/gmshtools.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index acf7183950..524ebec7ec 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -35,7 +35,7 @@ from femtest.testmesh import TestMeshCommon from femtest.testmesh import TestMeshEleTetra10 from femtest.testresult import TestResult from femtest.testccxtools import TestCcxTools -#from femtest.testsolverframework import TestSolverFrameWork +from femtest.testsolverframework import TestSolverFrameWork # dummy usage to get flake8 and lgtm quiet False if TestFemCommon.__name__ else True @@ -47,7 +47,7 @@ False if TestMeshEleTetra10.__name__ else True False if TestMeshEleTetra10.__name__ else True False if TestResult.__name__ else True False if TestCcxTools.__name__ else True -#False if TestSolverFrameWork.__name__ else True +False if TestSolverFrameWork.__name__ else True # For more information on how to run a specific test class or a test method see diff --git a/src/Mod/Fem/femmesh/gmshtools.py b/src/Mod/Fem/femmesh/gmshtools.py index 17bfc9398b..d4b286fb5a 100644 --- a/src/Mod/Fem/femmesh/gmshtools.py +++ b/src/Mod/Fem/femmesh/gmshtools.py @@ -604,8 +604,12 @@ class GmshTools(): if ele_nr: ele_nr = ele_nr.rstrip(", ") # print(ele_nr) + curly_br_s = "{" + curly_br_e = "}" + # explicit use double quotes in geo file geo.write( - "Physical " + physical_type + "("" + group + "") = {" + ele_nr + "};\n" + 'Physical {}("{}") = {}{}{};\n' + .format(physical_type, group, curly_br_s, ele_nr, curly_br_e) ) geo.write("\n") geo.write("// Characteristic Length\n")