suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: GUI: pref: add setting for non standard ccx time iterations param

Browse Source
This commit is contained in:
Bernd Hahnebach 2016-08-01 21:58:48 +01:00 committed by wmayer
parent 2fb6d51f9f
commit 5e4b95b1ba
3 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
View File

@ -220,16 +220,6 @@
<layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
<layout class="QGridLayout" name="gl_solver">
<item row="1" column="0">
<widget class="QLabel" name="l_solver">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Matrix Solver</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::PrefComboBox" name="cmb_solver">
<property name="enabled">
@ -266,10 +256,32 @@
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="l_non_lin_geom">
<item row="0" column="1">
<widget class="Gui::PrefSpinBox" name="sb_ccx_numcpu">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>40</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>AnalysisNumCPUs</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Ccx</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="l_use_iterations_param">
<property name="text">
<string>Non-Linear Geometry</string>
<string>Time Incrementation control paramter</string>
</property>
</widget>
</item>
@ -289,6 +301,23 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="l_solver">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Matrix Solver</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="l_non_lin_geom">
<property name="text">
<string>Non-Linear Geometry</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="l_ccx_numcpu">
<property name="text">
@ -296,22 +325,16 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::PrefSpinBox" name="sb_ccx_numcpu">
<property name="minimum">
<number>1</number>
<item row="4" column="1">
<widget class="Gui::PrefCheckBox" name="cb_use_iterations_param">
<property name="text">
<string>Use non ccx defaults</string>
</property>
<property name="maximum">
<number>40</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
<property name="checked">
<bool>false</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>AnalysisNumCPUs</cstring>
<cstring>UseNonCcxIterationParam</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Fem/Ccx</cstring>

2
src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
View File

@ -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

3
src/Mod/Fem/_FemSolverCalculix.py
View File

@ -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