From 80a9703acd7c987331c9e087b2b02532793dc2ec Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:13:45 +0100 Subject: [PATCH 01/37] Update solver.py --- src/Mod/Fem/femsolver/calculix/solver.py | 34 +++++++++++++++++++----- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index f6bfd07bb6..3ccc833dcc 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -198,19 +198,19 @@ 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 not hasattr(obj, "BucklingFactors"): obj.addProperty( @@ -242,6 +242,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 +352,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", From cfb2616c36f22fdb23f77d86092f3db389d5bbaa Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:17:34 +0100 Subject: [PATCH 02/37] Update write_step_equation.py --- .../femsolver/calculix/write_step_equation.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) 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) From b04fd4021569b073588b268c87f866ed2e7f01da Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:29:05 +0100 Subject: [PATCH 03/37] Update DlgSettingsFemCcx.ui --- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 186 +++++++++++++++++++++------ 1 file changed, 148 insertions(+), 38 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 393866c37e..7865805b31 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,35 @@ + + + + Maximum number of iterations + + + + + + + 1 + + + 10000000 + + + 10 + + + 2000 + + + AnalysisMaxIterations + + + Mod/Fem/Ccx + + + @@ -445,10 +474,10 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 3 + 9 - 0.010000000000000 + 0.000000001000000 0.010000000000000 @@ -484,10 +513,10 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 3 + 9 - 0.010000000000000 + 0.000000001000000 0.010000000000000 @@ -504,20 +533,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 +708,6 @@ - - - - Maximum number of iterations - - - - - - - 1 - - - 10000000 - - - 10 - - - 2000 - - - AnalysisMaxIterations - - - Mod/Fem/Ccx - - - From 30914209ae164e779b6c0b8a71e4ce3ce312297b Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:38:57 +0100 Subject: [PATCH 04/37] Update square_pipe_end_twisted_nodeforces.inp --- .../data/calculix/square_pipe_end_twisted_nodeforces.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3c77704977..19bb6e8c53 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 @@ -2561,7 +2561,7 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD *STEP -*STATIC +*STATIC, INC=200 *********************************************************** From 51c46d1a2405a8be139d254c5351d911bb537b38 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:41:23 +0100 Subject: [PATCH 05/37] Update thermomech_bimetall.py --- src/Mod/Fem/femexamples/thermomech_bimetall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 734edd8fd17350890869d091718b14ea263188f2 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:42:08 +0100 Subject: [PATCH 06/37] Update box_static.inp --- src/Mod/Fem/femtest/data/calculix/box_static.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femtest/data/calculix/box_static.inp b/src/Mod/Fem/femtest/data/calculix/box_static.inp index a11e5e3820..015fb40f1c 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 From 884dc2c30f48d89c5c3cdab4b2a41bdca88ba1fd Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:42:41 +0100 Subject: [PATCH 07/37] Update ccx_cantilever_beam_circle.inp --- .../Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 61e6847134..91cf87bf3f 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 From fd26660cd05ff35cbd27e3b3aebe5c1ccdaf164b Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:43:08 +0100 Subject: [PATCH 08/37] Update ccx_cantilever_beam_pipe.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 93143cfedd..c60a64673c 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 From b49a4f144b5e7388c2bf12e15eed621e11f15dd6 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:43:27 +0100 Subject: [PATCH 09/37] Update ccx_cantilever_beam_rect.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f857c351e..e4109fe5d5 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 From 2f7a029ac1eba7c95fa78ef15a19f1c159a23291 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:43:49 +0100 Subject: [PATCH 10/37] Update ccx_cantilever_ele_hexa20.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7e200cbdb4..0730fb3ed2 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 From c76dbf44594f9311e8d8a0ebe15fe878eab137a3 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:44:07 +0100 Subject: [PATCH 11/37] Update ccx_cantilever_ele_quad4.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e54d1cdaf2..e7ee84403d 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 From 9bc2b5c50696855c8e17a5d4186f530829012f7f Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:44:26 +0100 Subject: [PATCH 12/37] Update ccx_cantilever_ele_quad8.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5865f2894c..0f652ebbd1 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 From 6bddef5c6ccbb9336a54f765b46f78f0b030fd28 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:44:44 +0100 Subject: [PATCH 13/37] Update ccx_cantilever_ele_seg2.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8f32e410b8..50be05ece5 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 From b0783477a26381892c956fdbb2156d95500d6bf2 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:45:01 +0100 Subject: [PATCH 14/37] Update ccx_cantilever_ele_seg3.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b3da786e1f..476c5968b5 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 From 684c8a53679b074737c9d88c33c0ad81b57846b8 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:45:24 +0100 Subject: [PATCH 15/37] Update ccx_cantilever_ele_tria3.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bf2c5b3c22..bec70fd1e5 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 From b18afc0dab30325a070d59335ac3d7126d97f38a Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:45:41 +0100 Subject: [PATCH 16/37] Update ccx_cantilever_ele_tria6.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1038b295da..e01d81d920 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 From 7e9a468ca398d5c721e83c2974fa6a9875911494 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:46:02 +0100 Subject: [PATCH 17/37] Update ccx_cantilever_faceload.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46e8715e3b..33092c5bc9 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 From ba6b9de9596705deac4dd2c364449b45928d099d Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:46:19 +0100 Subject: [PATCH 18/37] Update ccx_cantilever_nodeload.inp --- src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ecad0c387..2004f1a460 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 From 38dce330607d08d83e1779fdfee7d7f729d72511 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:46:39 +0100 Subject: [PATCH 19/37] Update ccx_cantilever_prescribeddisplacement.inp --- .../data/calculix/ccx_cantilever_prescribeddisplacement.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f803012856..815ec60692 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 From da3069562ee156f97f0835bf1fa1bdfe87173076 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:47:19 +0100 Subject: [PATCH 20/37] Update constraint_contact_shell_shell.inp --- .../femtest/data/calculix/constraint_contact_shell_shell.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4f696b5b7d..8382e59786 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 From 02f3d361cc0ece60db065f9e89abcfd9b3b2f3c9 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:47:37 +0100 Subject: [PATCH 21/37] Update constraint_sectionprint.inp --- src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp b/src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp index e8ff5f13c9..14176c54ec 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 From 208d58646c9dc2ecf4ca1f7c8d24a3fdb3f18c28 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:47:54 +0100 Subject: [PATCH 22/37] Update constraint_selfweight_cantilever.inp --- .../femtest/data/calculix/constraint_selfweight_cantilever.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1721a498ea..aacd4d1102 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 From 1d1841b640d08dafd8c99bdc377509d63b670ff6 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:48:17 +0100 Subject: [PATCH 23/37] Update constraint_tie.inp --- src/Mod/Fem/femtest/data/calculix/constraint_tie.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp b/src/Mod/Fem/femtest/data/calculix/constraint_tie.inp index a201c5415f..c95467c939 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 From e11ccff6e2637a696f2071b2f4933eb76d4d7a41 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:48:42 +0100 Subject: [PATCH 24/37] Update constraint_transform_beam_hinged.inp --- .../femtest/data/calculix/constraint_transform_beam_hinged.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a81cedf777..48de5e40b0 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 From 5d0ab3910ccf7eb04d7b9d0595b1d530698ddab3 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:49:08 +0100 Subject: [PATCH 25/37] Update constraint_transform_torque.inp --- .../Fem/femtest/data/calculix/constraint_transform_torque.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80dad5dcea..805dc88c20 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 From 72f91e0c05b82633c78b486702dbe71f4e133c4f Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:49:32 +0100 Subject: [PATCH 26/37] Update material_multiple_bendingbeam_fiveboxes.inp --- .../data/calculix/material_multiple_bendingbeam_fiveboxes.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1af0d60156..239603709e 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 From a8bcdb2a683ebd7d2e723667b620f987505d0462 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:49:51 +0100 Subject: [PATCH 27/37] Update material_multiple_bendingbeam_fivefaces.inp --- .../data/calculix/material_multiple_bendingbeam_fivefaces.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 44c4b5ab2d..69e3508500 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 From c4f6e9a8c3e9f527d0490343a02d6400d15f49de Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:50:11 +0100 Subject: [PATCH 28/37] Update material_multiple_tensionrod_twoboxes.inp --- .../data/calculix/material_multiple_tensionrod_twoboxes.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 381828eb1b..1e8accdae7 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 From b3d182f73de6c8a97acd023cefcb87d1f03bbe85 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:50:33 +0100 Subject: [PATCH 29/37] Update material_nonlinear.inp --- src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp b/src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp index da02ee8944..def8eb4108 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 From e135e36d5daee619d96932bc6ab4ac11c602a3c9 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:50:52 +0100 Subject: [PATCH 30/37] Update square_pipe_end_twisted_edgeforces.inp --- .../data/calculix/square_pipe_end_twisted_edgeforces.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c6b3c53ec8..753232bed9 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 From b0759519decb413ff7e7547a41fb6b78d7a0d97e Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:52:41 +0100 Subject: [PATCH 31/37] Update square_pipe_end_twisted_nodeforces.inp --- .../data/calculix/square_pipe_end_twisted_nodeforces.inp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 19bb6e8c53..02759ba8cd 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,8 +2560,8 @@ Efaces *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP -*STATIC, INC=200 +*STEP, INC=200 +*STATIC *********************************************************** From 529a6da878a22b860ea304359ac4755ec428e0a4 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:32:18 +0100 Subject: [PATCH 32/37] Update thermomech_bimetall.inp --- src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp index 2be2695488..d2563c9423 100644 --- a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp +++ b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp @@ -7079,9 +7079,9 @@ Nall,273.0 *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP, INC=2000 +*STEP, INC=200 *COUPLED TEMPERATURE-DISPLACEMENT, SOLVER=SPOOLES, STEADY STATE -1.0,1.0 +1.0,1.0,1e-05,1.0 *********************************************************** ** Fixed Constraints From 96f3a7e8bcd1de66576f42487ad67e8e6caae401 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:47:18 +0100 Subject: [PATCH 33/37] Update thermomech_bimetall.inp --- src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp index d2563c9423..57818a086e 100644 --- a/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp +++ b/src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp @@ -7079,7 +7079,7 @@ Nall,273.0 *********************************************************** ** At least one step is needed to run an CalculiX analysis of FreeCAD -*STEP, INC=200 +*STEP, INC=2000 *COUPLED TEMPERATURE-DISPLACEMENT, SOLVER=SPOOLES, STEADY STATE 1.0,1.0,1e-05,1.0 From b19ac278f3a2e3306f22bdc2b1207cfbad7e1066 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:30:01 +0100 Subject: [PATCH 34/37] FEM: Update solver.py --- src/Mod/Fem/femsolver/calculix/solver.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index 3ccc833dcc..b22099ab28 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -212,6 +212,10 @@ def add_attributes(obj, ccx_prefs): niter = ccx_prefs.GetInt("AnalysisMaxIterations", 200) obj.IterationsMaximum = niter + if hasattr(obj, "IterationsThermoMechMaximum"): + obj.IterationsMaximum = obj.IterationsThermoMechMaximum + obj.removeProperty("IterationsThermoMechMaximum") + if not hasattr(obj, "BucklingFactors"): obj.addProperty( "App::PropertyIntegerConstraint", From c667dd2d456ae0ab6d04092b82241bbce4acb961 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Sun, 24 Mar 2024 19:10:00 +0100 Subject: [PATCH 35/37] FEM: Update DlgSettingsFemCcx.ui --- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 7865805b31..45ee0c7964 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -425,6 +425,9 @@ + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 1 From 58757a312948fd8ec2d14f3326f2701074d0d382 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Sun, 24 Mar 2024 19:12:30 +0100 Subject: [PATCH 36/37] FEM: Update DlgSettingsFemCcx.ui --- src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui index 45ee0c7964..ad991d117c 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui @@ -497,7 +497,7 @@ - + s @@ -536,7 +536,7 @@ - + s @@ -646,7 +646,7 @@ - + s @@ -808,7 +808,7 @@ - + Hz From 0434bc1197a0e09fd3e082419996d3139013c590 Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:44:29 +0100 Subject: [PATCH 37/37] FEM: Update DlgSettingsFemCcxImp.cpp --- src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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