From 77e4a6d20dd1b29167ea5e745fa2206df0c0a7f7 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 5 Mar 2017 19:33:56 +0100 Subject: [PATCH] FEM: code formating, flake8 --- src/Mod/Fem/FemInputWriterCcx.py | 1 + src/Mod/Fem/ObjectsFem.py | 1 - src/Mod/Fem/importFenicsMesh.py | 13 ++++++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py index a117ace81..f8f9cf9c4 100644 --- a/src/Mod/Fem/FemInputWriterCcx.py +++ b/src/Mod/Fem/FemInputWriterCcx.py @@ -1313,6 +1313,7 @@ def get_ccx_elset_solid_name(mat_name, solid_name=None, mat_short_name=None): else: return mat_name + solid_name + def liquid_section_def(obj, section_type): if section_type == 'PIPE MANNING': manning_area = str(obj.ManningArea.getValueAs('mm^2').Value) diff --git a/src/Mod/Fem/ObjectsFem.py b/src/Mod/Fem/ObjectsFem.py index 0abea2b16..fe313ab3a 100644 --- a/src/Mod/Fem/ObjectsFem.py +++ b/src/Mod/Fem/ObjectsFem.py @@ -236,7 +236,6 @@ def makeResultMechanical(name="MechanicalResult"): return obj - ########## solver objects ########## def makeSolverCalculix(name="CalculiX"): '''makeSolverCalculix(name): makes a Calculix solver object''' diff --git a/src/Mod/Fem/importFenicsMesh.py b/src/Mod/Fem/importFenicsMesh.py index 94ab49bbb..b8feb85e6 100644 --- a/src/Mod/Fem/importFenicsMesh.py +++ b/src/Mod/Fem/importFenicsMesh.py @@ -213,7 +213,6 @@ def read_fenics_mesh(xmlfilename): Returns element dictionary to be evaluated by make_femmesh later ''' - Fenics_to_FreeCAD_dict = { "triangle": "tria3", "tetrahedron": "tetra4", @@ -260,7 +259,7 @@ def read_fenics_mesh(xmlfilename): if vertex.tag.lower() == 'vertex': [node_x, node_y, node_z] = [float(vertex.get(coord, 0.)) for coord in ["x", "y", "z"]] - nodes_dict[ind+1] = FreeCAD.Vector(node_x, node_y, node_z) + nodes_dict[ind + 1] = FreeCAD.Vector(node_x, node_y, node_z) # increase node index by one, since fenics starts at 0, FreeCAD at 1 # print("%d %f %f %f" % (ind, node_x, node_y, node_z)) else: @@ -277,11 +276,11 @@ def read_fenics_mesh(xmlfilename): print("Strange mismatch between cell type %s and cell tag %s" % (cell_type, cell.tag.lower())) num_vertices = cells_parts_dim[cell_type][0] - vtupel = tuple([int(cell.get("v"+str(vnum)))+1 for vnum in range(num_vertices)]) + vtupel = tuple([int(cell.get("v" + str(vnum))) + 1 for vnum in range(num_vertices)]) # generate "v0", "v1", ... from dimension lookup table # increase numbers by one to match FC numbering convention - cell_dict[ind+1] = vtupel + cell_dict[ind + 1] = vtupel # valtupel = tuple([ind] + list(vtupel)) # print(("%d " + ("%d "*len(vtupel))) % valtupel) @@ -359,9 +358,9 @@ def read_fenics_mesh(xmlfilename): for ld in cell_lower_dims: for vertextuple in itertools.combinations(cell, num_vert_dict[ld]): element_counter[ld] = addtupletodict( - element_dict[Fenics_to_FreeCAD_dict[ld]], - vertextuple, - element_counter[ld]) + element_dict[Fenics_to_FreeCAD_dict[ld]], + vertextuple, + element_counter[ld]) length_counter = len(nodes) for (key, val_dict) in element_dict.iteritems():