diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index ad1f46c383..2b8c88a049 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -34,6 +34,45 @@ + + + + CalculiX binary + + + + + + + Search in known binary directories + + + true + + + UseStandardCcxLocation + + + Mod/Fem/Ccx + + + + + + + false + + + + 100 + 0 + + + + ccx binary path + + + @@ -113,38 +152,6 @@ - - - - Search in known binary directories - - - true - - - UseStandardCcxLocation - - - Mod/Fem/Ccx - - - - - - - false - - - - 100 - 0 - - - - ccx binary path - - - @@ -184,14 +191,7 @@ - - - - CalculiX binary - - - - + @@ -288,111 +288,10 @@ - - + + - Use non ccx defaults - - - false - - - UseNonCcxIterationParam - - - Mod/Fem/Ccx - - - - - - - Non-linear geometry - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - 0.010000000000000 - - - 0.010000000000000 - - - 0.010000000000000 - - - AnalysisTimeInitialStep - - - Mod/Fem/Ccx - - - - - - - Beam, shell element 3D output format - - - - - - - Time End - - - - - - - s - - - - - - - Use non-linear geometry - - - false - - - NonlinearGeometry - - - Mod/Fem/Ccx - - - - - - - Time Initial Step - - - - - - - 3D Output, unchecked for 2D - - - false - - - BeamShellOutput - - - Mod/Fem/Ccx + Number of CPU's to use (Spooles only) @@ -421,17 +320,13 @@ - - - - s + + + + true - - - - - Time incrementation control parameter + Matrix solver @@ -471,20 +366,108 @@ - - - - true - + + - Matrix solver + Non-linear geometry - - + + - Number of CPU's to use (Spooles only) + Use non-linear geometry + + + false + + + NonlinearGeometry + + + Mod/Fem/Ccx + + + + + + + Time incrementation control parameter + + + + + + + Use non ccx defaults + + + false + + + UseNonCcxIterationParam + + + Mod/Fem/Ccx + + + + + + + Time Initial Step + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + 0.010000000000000 + + + 0.010000000000000 + + + 0.010000000000000 + + + AnalysisTimeInitialStep + + + Mod/Fem/Ccx + + + + + + + s + + + + + + + Time End @@ -513,20 +496,37 @@ - - - - Qt::Horizontal + + + + s - - - 40 - 20 - - - + - + + + + Beam, shell element 3D output format + + + + + + + 3D Output, unchecked for 2D + + + false + + + BeamShellOutput + + + Mod/Fem/Ccx + + + + @@ -539,6 +539,29 @@ + + + + Analysis type (transient or steady state) + + + + + + + Use steady state + + + true + + + StaticAnalysis + + + Mod/Fem/Ccx + + + @@ -568,30 +591,7 @@ - - - - Use steady state - - - true - - - StaticAnalysis - - - Mod/Fem/Ccx - - - - - - - Analysis type (transient or steady state) - - - - + @@ -604,20 +604,6 @@ - - - - Hz - - - - - - - Hz - - - @@ -625,7 +611,20 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -650,6 +649,58 @@ + + + + High frequency limit + + + + + + + + 158 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 1 + + + 1000000.000000000000000 + + + 10000.000000000000000 + + + 1000000.000000000000000 + + + EigenmodeHighLimit + + + Mod/Fem/Ccx + + + + + + + Hz + + + + + + + Low frequency limit + + + @@ -684,65 +735,14 @@ - - - - - 158 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1 - - - 1000000.000000000000000 - - - 10000.000000000000000 - - - 1000000.000000000000000 - - - EigenmodeHighLimit - - - Mod/Fem/Ccx - - - - - + + - Low frequency limit + Hz - - - - High frequency limit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui index 401cabfe12..b316ed911c 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui @@ -42,6 +42,45 @@ + + + + ElmerGrid: + + + + + + + Search in known binary directories + + + true + + + UseStandardGridLocation + + + Mod/Fem/Elmer + + + + + + + false + + + + 100 + 0 + + + + ElmerGrid binary path + + + @@ -82,61 +121,6 @@ - - - - false - - - - 100 - 0 - - - - ElmerSolver binary path - - - - - - - false - - - - 100 - 0 - - - - ElmerGrid binary path - - - - - - - ElmerGrid: - - - - - - - Search in known binary directories - - - true - - - UseStandardGridLocation - - - Mod/Fem/Elmer - - - @@ -160,6 +144,22 @@ + + + + false + + + + 100 + 0 + + + + ElmerSolver binary path + + + diff --git a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui index b0c657fbef..af9bced786 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui @@ -14,19 +14,6 @@ INP - - - - Qt::Vertical - - - - 20 - 82 - - - - @@ -35,36 +22,14 @@ - - - - Mesh groups are exported too. -Every constraint and, if there are different materials, material -consists of two mesh groups, faces and nodes where the -constraint or material is applied. - + + - - - - false - - - AbaqusWriteGroups - - - Mod/Fem/Abaqus + Which mesh elements to export - - - - Export group data - - - - + All: All elements will be exported. @@ -104,19 +69,54 @@ not belonging to faces and faces not belonging to volumes. - - + + - Which mesh elements to export + Export group data - + + + + Mesh groups are exported too. +Every constraint and, if there are different materials, material +consists of two mesh groups, faces and nodes where the +constraint or material is applied. + + + + + + false + + + AbaqusWriteGroups + + + Mod/Fem/Abaqus + + + + - + + + + Qt::Vertical + + + + 20 + 82 + + + + + diff --git a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtk.ui b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtk.ui index 22d512c970..7ea21807a5 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemInOutVtk.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemInOutVtk.ui @@ -17,19 +17,6 @@ - - - - Qt::Vertical - - - - 20 - 82 - - - - @@ -101,7 +88,20 @@ exported from FreeCAD. - + + + + Qt::Vertical + + + + 20 + 82 + + + + + diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui b/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui index 2086de4790..485afa1c71 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemMaterial.ui @@ -75,7 +75,23 @@ - + + + + true + + + + 100 + 0 + + + + User directory + + + + true @@ -109,23 +125,7 @@ - - - - true - - - - 100 - 0 - - - - User directory - - - - + diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui index e175a9e250..342f19179e 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui @@ -34,46 +34,6 @@ - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 0 - 0 - - - - - 0 - 0 - - - - Leave blank to use default Z88 z88r binary file - - - z88BinaryPath - - - Mod/Fem/Z88 - - - @@ -118,7 +78,47 @@ - + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 0 + 0 + + + + + 0 + 0 + + + + Leave blank to use default Z88 z88r binary file + + + z88BinaryPath + + + Mod/Fem/Z88 + + + + @@ -143,90 +143,6 @@ - - - - - 0 - 20 - - - - Maximal places in coincidence vector. -(number of knots per element times - number of finite elements) - -You might need to increase this when using an -iterative solver and you get the error message -that "MAXKOI" needs to be increased. - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 50000 - - - 2147483647 - - - 100000 - - - 2800000 - - - MaxKOI - - - Mod/Fem/Z88 - - - - - - - Max places in stiffness matrix - - - - - - - - 0 - 20 - - - - Maximal places in stiffnes matrix. -You might need to increase this when using the -Cholesky solver and you get the error message -that "MAXGS" needs to be increased. - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 6000000 - - - 2147483647 - - - 10000000 - - - 100000000 - - - MaxGS - - - Mod/Fem/Z88 - - - @@ -274,6 +190,50 @@ that "MAXGS" needs to be increased. + + + + Max places in stiffness matrix + + + + + + + + 0 + 20 + + + + Maximal places in stiffnes matrix. +You might need to increase this when using the +Cholesky solver and you get the error message +that "MAXGS" needs to be increased. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 6000000 + + + 2147483647 + + + 10000000 + + + 100000000 + + + MaxGS + + + Mod/Fem/Z88 + + + @@ -281,7 +241,47 @@ that "MAXGS" needs to be increased. - + + + + + 0 + 20 + + + + Maximal places in coincidence vector. +(number of knots per element times + number of finite elements) + +You might need to increase this when using an +iterative solver and you get the error message +that "MAXKOI" needs to be increased. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 50000 + + + 2147483647 + + + 100000 + + + 2800000 + + + MaxKOI + + + Mod/Fem/Z88 + + + + diff --git a/src/Mod/Fem/Gui/Resources/ui/Material.ui b/src/Mod/Fem/Gui/Resources/ui/Material.ui index 6c5ab1d64c..527e925f1f 100755 --- a/src/Mod/Fem/Gui/Resources/ui/Material.ui +++ b/src/Mod/Fem/Gui/Resources/ui/Material.ui @@ -28,6 +28,13 @@ + + + + Category + + + @@ -35,10 +42,10 @@ - - + + - Category + Material card @@ -51,13 +58,6 @@ - - - - Material card - - - diff --git a/src/Mod/Fem/Gui/Resources/ui/MaterialReinforcement.ui b/src/Mod/Fem/Gui/Resources/ui/MaterialReinforcement.ui index 67fa6f6ec1..b187b2a2bf 100755 --- a/src/Mod/Fem/Gui/Resources/ui/MaterialReinforcement.ui +++ b/src/Mod/Fem/Gui/Resources/ui/MaterialReinforcement.ui @@ -31,6 +31,13 @@ + + + + Material + + + @@ -40,10 +47,17 @@ - - + + - Material + Properties + + + + + + + Edit @@ -61,21 +75,7 @@ - - - - Edit - - - - - - - Properties - - - - + @@ -104,6 +104,13 @@ + + + + Material + + + @@ -113,10 +120,17 @@ - - + + - Material + Properties + + + + + + + Edit @@ -134,21 +148,7 @@ - - - - Edit - - - - - - - Properties - - - - + diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui index f2719c886c..f701c8789b 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui @@ -59,42 +59,6 @@ - - - - mass flow rate: MF - - - Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - network pressure: NP - - - Qt::TextSelectableByMouse - - - - - - - von Mises stress: vM - - - Qt::TextSelectableByMouse - - - @@ -105,56 +69,6 @@ - - - - min. principal stress vector: s1x, s1y, s1z - - - Qt::TextSelectableByMouse - - - - - - - principal stresses: P1, P2, P3 - - - Qt::TextSelectableByMouse - - - - - - - reinforcement ratio: rx, ry, rz - - - Qt::TextSelectableByMouse - - - - - - - equivalent plastic strain: Peeq - - - Qt::TextSelectableByMouse - - - - - - - med. principal stress vector: s2x, s2y, s2z - - - Qt::TextSelectableByMouse - - - @@ -192,6 +106,22 @@ + + + + + 0 + 0 + + + + network pressure: NP + + + Qt::TextSelectableByMouse + + + @@ -202,6 +132,46 @@ + + + + mass flow rate: MF + + + Qt::TextSelectableByMouse + + + + + + + von Mises stress: vM + + + Qt::TextSelectableByMouse + + + + + + + reinforcement ratio: rx, ry, rz + + + Qt::TextSelectableByMouse + + + + + + + principal stresses: P1, P2, P3 + + + Qt::TextSelectableByMouse + + + @@ -212,6 +182,36 @@ + + + + equivalent plastic strain: Peeq + + + Qt::TextSelectableByMouse + + + + + + + min. principal stress vector: s1x, s1y, s1z + + + Qt::TextSelectableByMouse + + + + + + + med. principal stress vector: s2x, s2y, s2z + + + Qt::TextSelectableByMouse + + + diff --git a/src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui b/src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui index 8af431ab64..a591d1c073 100644 --- a/src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui +++ b/src/Mod/Fem/Gui/Resources/ui/SolverCalculix.ui @@ -61,6 +61,23 @@ 9 + + + + Static + + + true + + + + + + + Frequency + + + @@ -75,23 +92,6 @@ - - - - Frequency - - - - - - - Static - - - true - - - diff --git a/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui b/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui index a1e829cdd5..611a34dd77 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui +++ b/src/Mod/Fem/Gui/TaskFemConstraintSpring.ui @@ -63,16 +63,10 @@ - - - - - 0 - 0 - - - - + + + + Normal Stiffness @@ -86,13 +80,6 @@ - - - - Normal Stiffness - - - @@ -106,7 +93,20 @@ - + + + + + 0 + 0 + + + + + + + +