From 8cf89898027e379fee0a04dd72a27cdaea9ee5d9 Mon Sep 17 00:00:00 2001
From: ebrahimraeyat <ebe79442114@yahoo.com>
Date: Fri, 24 Apr 2020 22:51:57 +0200
Subject: [PATCH] FEM: ccx writer, changes in element sections

---
 src/Mod/Fem/femsolver/calculix/writer.py | 25 +++++++-----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py
index bbf79b1709..8e513c20c6 100644
--- a/src/Mod/Fem/femsolver/calculix/writer.py
+++ b/src/Mod/Fem/femsolver/calculix/writer.py
@@ -1733,13 +1733,6 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
                             material,
                             section_type
                         )
-                        # see forum topic for output formating of rotation
-                        # https://forum.freecadweb.org/viewtopic.php?f=18&t=46133&p=405142#p405142
-                        section_nor = "{:f}, {:f}, {:f}\n".format(
-                            normal[0],
-                            normal[1],
-                            normal[2]
-                        )
                     elif beamsec_obj.SectionType == "Circular":
                         radius = 0.5 * beamsec_obj.CircDiameter.getValueAs("mm")
                         section_type = ", SECTION=CIRC"
@@ -1749,11 +1742,6 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
                             material,
                             section_type
                         )
-                        section_nor = "{:f}, {:f}, {:f}\n".format(
-                            normal[0],
-                            normal[1],
-                            normal[2]
-                        )
                     elif beamsec_obj.SectionType == "Pipe":
                         radius = 0.5 * beamsec_obj.PipeDiameter.getValueAs("mm")
                         thickness = beamsec_obj.PipeThickness.getValueAs("mm")
@@ -1764,11 +1752,13 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
                             material,
                             section_type
                         )
-                        section_nor = "{:f}, {:f}, {:f}\n".format(
-                            normal[0],
-                            normal[1],
-                            normal[2]
-                        )
+                    # see forum topic for output formatting of rotation
+                    # https://forum.freecadweb.org/viewtopic.php?f=18&t=46133&p=405142#p405142
+                    section_nor = "{:f}, {:f}, {:f}\n".format(
+                        normal[0],
+                        normal[1],
+                        normal[2]
+                    )
                     f.write(section_def)
                     f.write(section_geo)
                     f.write(section_nor)
@@ -1810,7 +1800,6 @@ class FemInputWriterCcx(writerbase.FemInputWriter):
                     section_def = "*SOLID SECTION, " + elsetdef + material + "\n"
                     f.write(section_def)
 
-
 # ************************************************************************************************
 # Helpers
 # ccx elset names: