From 2fb6d51f9f0fdcfdc5f9bafbd06680ec44ccfc21 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Mon, 1 Aug 2016 21:58:44 +0100
Subject: [PATCH] FEM: calculix solver: better handling of iterations control
 parameter and

add them to FEM unit test
---
 src/Mod/Fem/FemInputWriterCcx.py  | 17 ++++++++--------
 src/Mod/Fem/TestFem.py            |  1 +
 src/Mod/Fem/_FemSolverCalculix.py | 32 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py
index 607495405..d5c0de662 100644
--- a/src/Mod/Fem/FemInputWriterCcx.py
+++ b/src/Mod/Fem/FemInputWriterCcx.py
@@ -365,10 +365,11 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
         elif self.solver_obj.GeometricalNonlinearity == "nonlinear" and self.analysis_type == 'frequency':
             print('Analysis type frequency and geometrical nonlinear analyis are not allowed together, linear is used instead!')
         f.write(static_frequency_step + '\n')
-        f.write('*CONTROLS,PARAMETERS=TIME INCREMENTATION\n')
-        f.write('4,8,9,200,10,400,,200,\n')
-        f.write('0.25,0.5,0.75,0.85,,,1.5,\n')
-        f.write('*STATIC')
+        if self.solver_obj.IterationsControlParameterTimeUse:
+            f.write('*CONTROLS, PARAMETERS=TIME INCREMENTATION\n')
+            f.write(self.solver_obj.IterationsControlParameterIter + '\n')
+            f.write(self.solver_obj.IterationsControlParameterCutb + '\n')
+        analysis_static = '*STATIC'
         if self.solver_obj.MatrixSolverType == "default":
             pass
         elif self.solver_obj.MatrixSolverType == "spooles":
@@ -388,10 +389,10 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter):
             thermomech_step += ', NLGEOM'
         thermomech_step += ', INC=' + str(self.solver_obj.IterationsMaximum)
         f.write(thermomech_step + '\n')
-        f.write(step)
-        f.write('*CONTROLS,PARAMETERS=TIME INCREMENTATION\n')
-        f.write('4,8,9,200,10,400,,200,\n')
-        f.write('0.25,0.5,0.75,0.85,,,1.5,\n')
+        if self.solver_obj.IterationsControlParameterTimeUse:
+            f.write('*CONTROLS, PARAMETERS=TIME INCREMENTATION\n')
+            f.write(self.solver_obj.IterationsControlParameterIter + '\n')
+            f.write(self.solver_obj.IterationsControlParameterCutb + '\n')
 
     def write_constraints_fixed(self, f):
         f.write('\n***********************************************************\n')
diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index 220ada0cc..130a67e98 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -78,6 +78,7 @@ class FemTest(unittest.TestCase):
         self.solver_object.GeometricalNonlinearity = 'linear'
         self.solver_object.SteadyState = True
         self.solver_object.MatrixSolverType = 'default'
+        self.solver_object.IterationsControlParameterTimeUse = False
         self.active_doc.recompute()
 
     def create_new_mesh(self):
diff --git a/src/Mod/Fem/_FemSolverCalculix.py b/src/Mod/Fem/_FemSolverCalculix.py
index 6bb3eeb96..66c5747de 100644
--- a/src/Mod/Fem/_FemSolverCalculix.py
+++ b/src/Mod/Fem/_FemSolverCalculix.py
@@ -89,6 +89,38 @@ class _FemSolverCalculix():
         sted = ccx_prefs.GetBool("StaticAnalysis", True)
         obj.SteadyState = (sted)
 
+        obj.addProperty("App::PropertyBool", "IterationsControlParameterTimeUse", "Fem", "Use the user defined time incrementation control parameter")
+        obj.IterationsControlParameterTimeUse = False
+
+        ccx_default_time_incrementation_control_parameter = {
+            # iteration parameter
+            'I_0': 4,
+            'I_R': 8,
+            'I_P': 9,
+            'I_C': 200,  # ccx default = 16
+            'I_L': 10,
+            'I_G': 400,  # ccx default = 4
+            'I_S': None,
+            'I_A': 200,  # ccx default = 5
+            'I_J': None,
+            'I_T': None,
+            # cutback parameter
+            'D_f': 0.25,
+            'D_C': 0.5,
+            'D_B': 0.75,
+            'D_A': 0.85,
+            'D_S': None,
+            'D_H': None,
+            'D_D': 1.5,
+            'W_G': None}
+        p = ccx_default_time_incrementation_control_parameter
+        p_iter = '{0},{1},{2},{3},{4},{5},{6},{7},{8},{9}'.format(p['I_0'], p['I_R'], p['I_P'], p['I_C'], p['I_L'], p['I_G'], '', p['I_A'], '', '')
+        p_cutb = '{0},{1},{2},{3},{4},{5},{6},{7}'.format(p['D_f'], p['D_C'], p['D_B'], p['D_A'], '', '', p['D_D'], '')
+        obj.addProperty("App::PropertyString", "IterationsControlParameterIter", "Fem", "User defined time incrementation iterations control parameter")
+        obj.IterationsControlParameterIter = p_iter
+        obj.addProperty("App::PropertyString", "IterationsControlParameterCutb", "Fem", "User defined time incrementation cutbacks control parameter")
+        obj.IterationsControlParameterCutb = p_cutb
+
         known_ccx_solver_types = ["default", "spooles", "iterativescaling", "iterativecholesky"]
         obj.addProperty("App::PropertyEnumeration", "MatrixSolverType", "Fem", "Type of solver to use")
         obj.MatrixSolverType = known_ccx_solver_types