diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 46537effc4..f09608cf7f 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -393,14 +393,14 @@ - + Time incrementation control parameter - + Use non ccx defaults @@ -416,6 +416,38 @@ + + + + Maximum number of iterations + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 1 + + + 10000000 + + + 10 + + + 2000 + + + AnalysisMaxIterations + + + Mod/Fem/Ccx + + + @@ -445,10 +477,10 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 3 + 9 - 0.010000000000000 + 0.000000001000000 0.010000000000000 @@ -465,7 +497,7 @@ - + s @@ -484,10 +516,10 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 3 + 9 - 0.010000000000000 + 0.000000001000000 0.010000000000000 @@ -504,20 +536,130 @@ + + + s + + + + + + + Time Minimum Step + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::DefaultContextMenu + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 9 + + + 0.000000001000000 + + + 0.010000000000000 + + + 0.000010000000000 + + + AnalysisTimeMinimumStep + + + Mod/Fem/Ccx + + + + + + + s + + + + + + + Time Maximum Step + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::DefaultContextMenu + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 9 + + + 0.000000001000000 + + + 1.000000000000000 + + + 1.000000000000000 + + + AnalysisTimeMaximumStep + + + Mod/Fem/Ccx + + + + s - + Beam, shell element 3D output format - + 3D Output, unchecked for 2D @@ -569,35 +711,6 @@ - - - - Maximum number of iterations - - - - - - - 1 - - - 10000000 - - - 10 - - - 2000 - - - AnalysisMaxIterations - - - Mod/Fem/Ccx - - - @@ -695,7 +808,7 @@ - + Hz diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp index a5030ffd0a..bea9df709f 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp @@ -73,6 +73,8 @@ void DlgSettingsFemCcxImp::saveSettings() ui->sb_ccx_max_iterations->onSave(); // Max number of iterations ui->dsb_ccx_initial_time_step->onSave(); // Initial time step ui->dsb_ccx_analysis_time->onSave(); // Analysis time + ui->dsb_ccx_minimum_time_step->onSave(); // Minimum time step + ui->dsb_ccx_maximum_time_step->onSave(); // Maximum time step ui->cb_analysis_type->onSave(); ui->cb_BeamShellOutput->onSave(); // Beam shell output 3d or 2d @@ -98,6 +100,8 @@ void DlgSettingsFemCcxImp::loadSettings() ui->sb_ccx_max_iterations->onRestore(); // Max number of iterations ui->dsb_ccx_initial_time_step->onRestore(); // Initial time step ui->dsb_ccx_analysis_time->onRestore(); // Analysis time + ui->dsb_ccx_minimum_time_step->onRestore(); // Minimum time step + ui->dsb_ccx_maximum_time_step->onRestore(); // Maximum time step ui->cb_analysis_type->onRestore(); ui->cb_BeamShellOutput->onRestore(); // Beam shell output 3d or 2d diff --git a/src/Mod/Fem/femexamples/thermomech_bimetall.py b/src/Mod/Fem/femexamples/thermomech_bimetall.py index a34763d9c3..8368eb703a 100644 --- a/src/Mod/Fem/femexamples/thermomech_bimetall.py +++ b/src/Mod/Fem/femexamples/thermomech_bimetall.py @@ -145,7 +145,7 @@ def setup(doc=None, solvertype="ccxtools"): # solver_obj.MatrixSolverType = "default" solver_obj.MatrixSolverType = "spooles" # thomas solver_obj.SplitInputWriter = False - solver_obj.IterationsThermoMechMaximum = 2000 + solver_obj.IterationsMaximum = 2000 # solver_obj.IterationsControlParameterTimeUse = True # thermomech spine analysis.addObject(solver_obj) diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index fb5d18aeaf..8d60061ed8 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -198,19 +198,23 @@ def add_attributes(obj, ccx_prefs): ehl = ccx_prefs.GetFloat("EigenmodeHighLimit", 1000000.0) obj.EigenmodeHighLimit = (ehl, 0.0, 1000000.0, 10000.0) - if not hasattr(obj, "IterationsThermoMechMaximum"): - help_string_IterationsThermoMechMaximum = ( - "Maximum Number of thermo mechanical iterations " + if not hasattr(obj, "IterationsMaximum"): + help_string_IterationsMaximum = ( + "Maximum Number of iterations " "in each time step before stopping jobs" ) obj.addProperty( "App::PropertyIntegerConstraint", - "IterationsThermoMechMaximum", + "IterationsMaximum", "Fem", - help_string_IterationsThermoMechMaximum + help_string_IterationsMaximum ) niter = ccx_prefs.GetInt("AnalysisMaxIterations", 200) - obj.IterationsThermoMechMaximum = niter + obj.IterationsMaximum = niter + + if hasattr(obj, "IterationsThermoMechMaximum"): + obj.IterationsMaximum = obj.IterationsThermoMechMaximum + obj.removeProperty("IterationsThermoMechMaximum") if not hasattr(obj, "BucklingFactors"): obj.addProperty( @@ -242,6 +246,26 @@ def add_attributes(obj, ccx_prefs): eni = ccx_prefs.GetFloat("AnalysisTime", 1.0) obj.TimeEnd = eni + if not hasattr(obj, "TimeMinimumStep"): + obj.addProperty( + "App::PropertyFloatConstraint", + "TimeMinimumStep", + "Fem", + "Minimum time step" + ) + mini = ccx_prefs.GetFloat("AnalysisTimeMinimumStep", 0.00001) + obj.TimeMinimumStep = mini + + if not hasattr(obj, "TimeMaximumStep"): + obj.addProperty( + "App::PropertyFloatConstraint", + "TimeMaximumStep", + "Fem", + "Maximum time step" + ) + maxi = ccx_prefs.GetFloat("AnalysisTimeMaximumStep", 1.0) + obj.TimeMaximumStep = maxi + if not hasattr(obj, "ThermoMechSteadyState"): obj.addProperty( "App::PropertyBool", @@ -332,7 +356,7 @@ def add_attributes(obj, ccx_prefs): if not hasattr(obj, "IterationsUserDefinedTimeStepLength"): help_string_IterationsUserDefinedTimeStepLength = ( "Set to True to use the user defined time steps. " - "The time steps are set with TimeInitialStep and TimeEnd" + "They are set with TimeInitialStep, TimeEnd, TimeMinimum and TimeMaximum" ) obj.addProperty( "App::PropertyBool", diff --git a/src/Mod/Fem/femsolver/calculix/write_step_equation.py b/src/Mod/Fem/femsolver/calculix/write_step_equation.py index e4beef37c2..02a06c1f1f 100644 --- a/src/Mod/Fem/femsolver/calculix/write_step_equation.py +++ b/src/Mod/Fem/femsolver/calculix/write_step_equation.py @@ -45,12 +45,11 @@ def write_step_equation(f, ccxwriter): "Analysis type frequency and geometrical nonlinear " "analysis are not allowed together, linear is used instead!\n" ) - if ccxwriter.solver_obj.IterationsThermoMechMaximum: - if ccxwriter.analysis_type == "thermomech": - step += ", INC={}".format(ccxwriter.solver_obj.IterationsThermoMechMaximum) + if ccxwriter.solver_obj.IterationsMaximum: + if ccxwriter.analysis_type == "thermomech" or ccxwriter.analysis_type == "static": + step += ", INC={}".format(ccxwriter.solver_obj.IterationsMaximum) elif ( - ccxwriter.analysis_type == "static" - or ccxwriter.analysis_type == "frequency" + ccxwriter.analysis_type == "frequency" or ccxwriter.analysis_type == "buckling" ): # parameter is for thermomechanical analysis only, see ccx manual *STEP @@ -124,9 +123,11 @@ def write_step_equation(f, ccxwriter): if ccxwriter.analysis_type == "static" or ccxwriter.analysis_type == "check": if ccxwriter.solver_obj.IterationsUserDefinedIncrementations is True \ or ccxwriter.solver_obj.IterationsUserDefinedTimeStepLength is True: - analysis_parameter = "{},{}".format( + analysis_parameter = "{},{},{},{}".format( ccxwriter.solver_obj.TimeInitialStep, - ccxwriter.solver_obj.TimeEnd + ccxwriter.solver_obj.TimeEnd, + ccxwriter.solver_obj.TimeMinimumStep, + ccxwriter.solver_obj.TimeMaximumStep ) elif ccxwriter.analysis_type == "frequency": if ccxwriter.solver_obj.EigenmodeLowLimit == 0.0 \ @@ -140,9 +141,11 @@ def write_step_equation(f, ccxwriter): ) elif ccxwriter.analysis_type == "thermomech": # OvG: 1.0 increment, total time 1 for steady state will cut back automatically - analysis_parameter = "{},{}".format( + analysis_parameter = "{},{},{},{}".format( ccxwriter.solver_obj.TimeInitialStep, - ccxwriter.solver_obj.TimeEnd + ccxwriter.solver_obj.TimeEnd, + ccxwriter.solver_obj.TimeMinimumStep, + ccxwriter.solver_obj.TimeMaximumStep ) elif ccxwriter.analysis_type == "buckling": analysis_parameter = "{}\n".format(ccxwriter.solver_obj.BucklingFactors) diff --git a/src/Mod/Fem/femtest/data/calculix/box_static.inp b/src/Mod/Fem/femtest/data/calculix/box_static.inp index b3380bd960..2357b51200 100644 --- a/src/Mod/Fem/femtest/data/calculix/box_static.inp +++ b/src/Mod/Fem/femtest/data/calculix/box_static.inp @@ -489,7 +489,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp index 31bcd23b49..c61d0b81d6 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp @@ -62,7 +62,7 @@ Eedges *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp index 3b00eee774..b2366b0f18 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp @@ -62,7 +62,7 @@ Eedges *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp index 6d3eb29682..158145c70a 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp @@ -62,7 +62,7 @@ Eedges *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp index 3060c64375..bd7c47159e 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp @@ -385,7 +385,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp index 4b9576c2bd..7b7cd41ff8 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp @@ -86,7 +86,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp index 111fdf49b7..a201a9c3a2 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp @@ -74,7 +74,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp index 73b099e0ef..fb0a022008 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp @@ -204,7 +204,7 @@ Eedges *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp index 49fb62c6b9..72dd4db87c 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp @@ -62,7 +62,7 @@ Eedges *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp index 7c062296e5..59da919b13 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp @@ -1562,7 +1562,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp index 5c0e12187f..04dda8c146 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp @@ -292,7 +292,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp index 3a6ab24119..03f0e80bd7 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp @@ -359,7 +359,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp index 107253f1d5..9198e5c3a4 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp @@ -359,7 +359,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp index 47cc8a4cc8..d4a67e562b 100644 --- a/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp +++ b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp @@ -377,7 +377,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp b/src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp index c39beee71f..1a6bc45f52 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp @@ -38373,7 +38373,7 @@ DEPConstraintContact, INDConstraintContact *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp b/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp index 2c83229bb6..501355f029 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp @@ -3401,7 +3401,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp b/src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp index e27d347cf4..6eb8cf3780 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp @@ -2153,7 +2153,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp b/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp index c00b1d5d73..cc73eb5c7f 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp @@ -18612,7 +18612,7 @@ TIE_DEPConstraintTie, TIE_INDConstraintTie *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_transform_beam_hinged.inp b/src/Mod/Fem/femtest/data/calculix/constraint_transform_beam_hinged.inp index f20ff9d23f..23715d316d 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_transform_beam_hinged.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_transform_beam_hinged.inp @@ -3639,7 +3639,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_transform_torque.inp b/src/Mod/Fem/femtest/data/calculix/constraint_transform_torque.inp index dd776985b2..7489f67648 100644 --- a/src/Mod/Fem/femtest/data/calculix/constraint_transform_torque.inp +++ b/src/Mod/Fem/femtest/data/calculix/constraint_transform_torque.inp @@ -10980,7 +10980,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp b/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp index 517770b828..5ec1a3d3e7 100644 --- a/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp +++ b/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp @@ -27634,7 +27634,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp b/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp index 08f88f3935..9ac894a8c5 100644 --- a/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp +++ b/src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp @@ -2548,7 +2548,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp b/src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp index 193f9e780d..d378596781 100644 --- a/src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp +++ b/src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp @@ -1231,7 +1231,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp b/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp index e0e16e90ed..c2cb7c0505 100644 --- a/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp +++ b/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp @@ -20004,7 +20004,7 @@ Evolumes *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP, NLGEOM +*STEP, NLGEOM, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp b/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp index 4bc8f67606..a70ab0a392 100644 --- a/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp +++ b/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp @@ -2560,7 +2560,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp b/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp index 6aa03980b3..6e68876fff 100644 --- a/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp +++ b/src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp @@ -2560,7 +2560,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP +*STEP, INC=200 *STATIC diff --git a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp index 3d95c77f3d..90fce0f689 100644 --- a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp +++ b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp @@ -7081,7 +7081,7 @@ Nall,273.0 ** At least one step is needed to run an CalculiX analysis of FreeCAD *STEP, INC=2000 *COUPLED TEMPERATURE-DISPLACEMENT, SOLVER=SPOOLES, STEADY STATE -1.0,1.0 +1.0,1.0,1e-05,1.0 *********************************************************** ** Fixed Constraints