diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index b0f0a77fb..d1e56ed8b 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -220,16 +220,6 @@ - - - - true - - - Matrix Solver - - - @@ -266,10 +256,32 @@ - - + + + + 1 + + + 40 + + + 1 + + + 1 + + + AnalysisNumCPUs + + + Mod/Fem/Ccx + + + + + - Non-Linear Geometry + Time Incrementation control paramter @@ -289,6 +301,23 @@ + + + + true + + + Matrix Solver + + + + + + + Non-Linear Geometry + + + @@ -296,22 +325,16 @@ - - - - 1 + + + + Use non ccx defaults - - 40 - - - 1 - - - 1 + + false - AnalysisNumCPUs + UseNonCcxIterationParam Mod/Fem/Ccx diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp index 0640ce27e..0940cbf2a 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp @@ -52,6 +52,7 @@ void DlgSettingsFemCcxImp::saveSettings() sb_ccx_numcpu->onSave(); //Number of CPUs cmb_solver->onSave(); cb_ccx_non_lin_geom->onSave(); + cb_use_iterations_param->onSave(); cb_static->onSave(); sb_ccx_max_iterations->onSave(); //Max number of iterations @@ -73,6 +74,7 @@ void DlgSettingsFemCcxImp::loadSettings() sb_ccx_numcpu->onRestore(); //Number of CPUs cmb_solver->onRestore(); cb_ccx_non_lin_geom->onRestore(); + cb_use_iterations_param->onRestore(); cb_static->onRestore(); sb_ccx_max_iterations->onRestore(); //Max number of iterations diff --git a/src/Mod/Fem/_FemSolverCalculix.py b/src/Mod/Fem/_FemSolverCalculix.py index 66c5747de..37ba7275c 100644 --- a/src/Mod/Fem/_FemSolverCalculix.py +++ b/src/Mod/Fem/_FemSolverCalculix.py @@ -90,7 +90,8 @@ class _FemSolverCalculix(): obj.SteadyState = (sted) obj.addProperty("App::PropertyBool", "IterationsControlParameterTimeUse", "Fem", "Use the user defined time incrementation control parameter") - obj.IterationsControlParameterTimeUse = False + use_non_ccx_iterations_param = ccx_prefs.GetInt("UseNonCcxIterationParam", False) + obj.IterationsControlParameterTimeUse = use_non_ccx_iterations_param ccx_default_time_incrementation_control_parameter = { # iteration parameter