From dbd1619a2094b66a8fb23c6fdfde88f287af2ede Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Wed, 2 Aug 2017 05:53:00 +0100
Subject: [PATCH] FEM: code formating, better readable return values

---
 src/Mod/Fem/importCcxFrdResults.py | 21 ++++++++++++++++-----
 src/Mod/Fem/importInpMesh.py       | 20 +++++++++++++++-----
 src/Mod/Fem/importZ88Mesh.py       | 19 ++++++++++++++-----
 src/Mod/Fem/readFenicsXML.py       | 19 ++++++++++++++-----
 4 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Fem/importCcxFrdResults.py b/src/Mod/Fem/importCcxFrdResults.py
index 49c370fc2b..fd3f73ce43 100644
--- a/src/Mod/Fem/importCcxFrdResults.py
+++ b/src/Mod/Fem/importCcxFrdResults.py
@@ -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
+    }
diff --git a/src/Mod/Fem/importInpMesh.py b/src/Mod/Fem/importInpMesh.py
index fb93d183cf..de0e6b94c7 100644
--- a/src/Mod/Fem/importInpMesh.py
+++ b/src/Mod/Fem/importInpMesh.py
@@ -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
+    }
diff --git a/src/Mod/Fem/importZ88Mesh.py b/src/Mod/Fem/importZ88Mesh.py
index 003a8477f8..16c4c936a3 100644
--- a/src/Mod/Fem/importZ88Mesh.py
+++ b/src/Mod/Fem/importZ88Mesh.py
@@ -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
diff --git a/src/Mod/Fem/readFenicsXML.py b/src/Mod/Fem/readFenicsXML.py
index 65738543de..6b9ec02979 100644
--- a/src/Mod/Fem/readFenicsXML.py
+++ b/src/Mod/Fem/readFenicsXML.py
@@ -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': {}
+    }