FEM: nonlinear material, add a third yield point and only write yield…

… points if they are not empty
FreeCAD · Jul 3, 2017 · 3f16f0a · 3f16f0a
1 parent 06054bd
commit 3f16f0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
@@ -603,8 +603,12 @@ def write_materials(self, f):
                     if nl_mat_obj.LinearBaseMaterial == mat_obj:
                         if nl_mat_obj.MaterialModelNonlinearity == "simple hardening":
                             f.write('*PLASTIC\n')
-                            f.write(nl_mat_obj.YieldPoint1 + '\n')
-                            f.write(nl_mat_obj.YieldPoint2 + '\n')
+                            if nl_mat_obj.YieldPoint1:
+                                f.write(nl_mat_obj.YieldPoint1 + '\n')
+                            if nl_mat_obj.YieldPoint2:
+                                f.write(nl_mat_obj.YieldPoint2 + '\n')
+                            if nl_mat_obj.YieldPoint3:
+                                f.write(nl_mat_obj.YieldPoint3 + '\n')
                     f.write('\n')
 
     def write_constraints_initialtemperature(self, f):

diff --git a/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py
@@ -44,8 +44,11 @@ def __init__(self, obj):
         obj.addProperty("App::PropertyString", "YieldPoint1", "Fem", "Set stress and strain for yield point one, separated by a comma.")
         obj.YieldPoint1 = "235.0, 0.0"
 
-        obj.addProperty("App::PropertyString", "YieldPoint2", "Fem", "Set stress and strain for yield point one, separated by a comma.")
+        obj.addProperty("App::PropertyString", "YieldPoint2", "Fem", "Set stress and strain for yield point two, separated by a comma.")
         obj.YieldPoint2 = "241.0, 0.025"
 
+        obj.addProperty("App::PropertyString", "YieldPoint3", "Fem", "Set stress and strain for yield point three, separated by a comma.")
+        obj.YieldPoint3 = ""
+
     def execute(self, obj):
         return