kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: code formating, better readable return values

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-08-02 05:53:00 +01:00
parent 4636119084
commit dbd1619a20
4 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Fem/importCcxFrdResults.py
View File

@@ -535,8 +535,19 @@ def readResult(frd_input):
FreeCAD.Console.PrintError('We have mflow or npressure, but no inout_nodes file.\n')
if not nodes:
FreeCAD.Console.PrintError('FEM: No nodes found in Frd file.\n')
return {'Nodes': nodes,
'Hexa8Elem': elements_hexa8, 'Penta6Elem': elements_penta6, 'Tetra4Elem': elements_tetra4, 'Tetra10Elem': elements_tetra10,
'Penta15Elem': elements_penta15, 'Hexa20Elem': elements_hexa20, 'Tria3Elem': elements_tria3, 'Tria6Elem': elements_tria6,
'Quad4Elem': elements_quad4, 'Quad8Elem': elements_quad8, 'Seg2Elem': elements_seg2, 'Seg3Elem': elements_seg3,
'Results': results}
return {
'Nodes': nodes,
'Seg2Elem': elements_seg2,
'Seg3Elem': elements_seg3,
'Tria3Elem': elements_tria3,
'Tria6Elem': elements_tria6,
'Quad4Elem': elements_quad4,
'Quad8Elem': elements_quad8,
'Tetra4Elem': elements_tetra4,
'Tetra10Elem': elements_tetra10,
'Hexa8Elem': elements_hexa8,
'Hexa20Elem': elements_hexa20,
'Penta6Elem': elements_penta6,
'Penta15Elem': elements_penta15,
'Results': results
}

20
src/Mod/Fem/importInpMesh.py
View File

@@ -235,8 +235,18 @@ def read_inp(file_name):
n = elements.seg3[en]
elements.seg3[en] = [n[0], n[2], n[1]]
return {'Nodes': nodes,
'Hexa8Elem': elements.hexa8, 'Penta6Elem': elements.penta6, 'Tetra4Elem': elements.tetra4,
'Tetra10Elem': elements.tetra10, 'Penta15Elem': elements.penta15, 'Hexa20Elem': elements.hexa20,
'Tria3Elem': elements.tria3, 'Tria6Elem': elements.tria6, 'Quad4Elem': elements.quad4,
'Quad8Elem': elements.quad8, 'Seg2Elem': elements.seg2, 'Seg3Elem': elements.seg3}
return {
'Nodes': nodes,
'Seg2Elem': elements.seg2,
'Seg3Elem': elements.seg3,
'Tria3Elem': elements.tria3,
'Tria6Elem': elements.tria6,
'Quad4Elem': elements.quad4,
'Quad8Elem': elements.quad8,
'Tetra4Elem': elements.tetra4,
'Tetra10Elem': elements.tetra10,
'Hexa8Elem': elements.hexa8,
'Hexa20Elem': elements.hexa20,
'Penta6Elem': elements.penta6,
'Penta15Elem': elements.penta15
}

19
src/Mod/Fem/importZ88Mesh.py
View File

@@ -301,11 +301,20 @@ def read_z88_mesh(z88_mesh_input):
print(e, ' ', elements_tria6[e])
z88_mesh_file.close()
return {'Nodes': nodes,
'Hexa8Elem': elements_hexa8, 'Penta6Elem': elements_penta6, 'Tetra4Elem': elements_tetra4, 'Tetra10Elem': elements_tetra10,
'Penta15Elem': elements_penta15, 'Hexa20Elem': elements_hexa20, 'Tria3Elem': elements_tria3, 'Tria6Elem': elements_tria6,
'Quad4Elem': elements_quad4, 'Quad8Elem': elements_quad8, 'Seg2Elem': elements_seg2,
}
return {
'Nodes': nodes,
'Seg2Elem': elements_seg2,
'Tria3Elem': elements_tria3,
'Tria6Elem': elements_tria6,
'Quad4Elem': elements_quad4,
'Quad8Elem': elements_quad8,
'Tetra4Elem': elements_tetra4,
'Tetra10Elem': elements_tetra10,
'Hexa8Elem': elements_hexa8,
'Hexa20Elem': elements_hexa20,
'Penta6Elem': elements_penta6,
'Penta15Elem': elements_penta15
}
# write z88 Mesh

19
src/Mod/Fem/readFenicsXML.py
View File

@@ -225,8 +225,17 @@ def read_fenics_mesh_xml(xmlfilename):
if root.find("data") is not None:
print("Internal mesh data found")
return {'Nodes': nodes,
'Hexa8Elem': {}, 'Penta6Elem': {}, 'Tetra4Elem': element_dict['tetra4'], 'Tetra10Elem': {},
'Penta15Elem': {}, 'Hexa20Elem': {}, 'Tria3Elem': element_dict['tria3'], 'Tria6Elem': {},
'Quad4Elem': element_dict['quad4'], 'Quad8Elem': {}, 'Seg2Elem': element_dict['seg2']
}
return {
'Nodes': nodes,
'Seg2Elem': element_dict['seg2'],
'Tria3Elem': element_dict['tria3'],
'Tria6Elem': {},
'Quad4Elem': element_dict['quad4'],
'Quad8Elem': {},
'Tetra4Elem': element_dict['tetra4'],
'Tetra10Elem': {},
'Hexa8Elem': {},
'Hexa20Elem': {},
'Penta6Elem': {},
'Penta15Elem': {}
}