From 3c44afdc6aa8e91b46f4a3e29d885682f5ef3fd7 Mon Sep 17 00:00:00 2001
From: FEA-eng <59876896+FEA-eng@users.noreply.github.com>
Date: Mon, 26 Feb 2024 18:01:05 +0100
Subject: [PATCH] FEM Beam Shell Result Output 3D true by default (#12493)
---
src/Mod/Fem/Gui/DlgSettingsFemCcx.ui | 2 +-
src/Mod/Fem/femsolver/calculix/solver.py | 2 +-
.../Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp | 2 +-
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp | 2 +-
.../data/calculix/material_multiple_bendingbeam_fivefaces.inp | 2 +-
.../data/calculix/square_pipe_end_twisted_edgeforces.inp | 2 +-
.../data/calculix/square_pipe_end_twisted_nodeforces.inp | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index 1a057bb4cc..393866c37e 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -523,7 +523,7 @@
3D Output, unchecked for 2D
- false
+ true
BeamShellOutput
diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py
index eceeeac691..f6bfd07bb6 100644
--- a/src/Mod/Fem/femsolver/calculix/solver.py
+++ b/src/Mod/Fem/femsolver/calculix/solver.py
@@ -368,7 +368,7 @@ def add_attributes(obj, ccx_prefs):
"Fem",
"Output 3D results for 1D and 2D analysis "
)
- dimout = ccx_prefs.GetBool("BeamShellOutput", False)
+ dimout = ccx_prefs.GetBool("BeamShellOutput", True)
obj.BeamShellResultOutput3D = dimout
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 28c6659540..61e6847134 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
@@ -89,7 +89,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 b3580ae848..93143cfedd 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
@@ -89,7 +89,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 466bbbc895..0f857c351e 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
@@ -89,7 +89,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 c01e8323f4..e54d1cdaf2 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
@@ -115,7 +115,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 79f484fef1..5865f2894c 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
@@ -105,7 +105,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 18f22dfd05..8f32e410b8 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
@@ -231,7 +231,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 7c7d536051..b3da786e1f 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
@@ -89,7 +89,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 410a0b5ddb..bf2c5b3c22 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
@@ -1596,7 +1596,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 7eea04c337..1038b295da 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
@@ -323,7 +323,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 ef2771016c..44c4b5ab2d 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
@@ -2687,7 +2687,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 231b0c9d5c..c6b3c53ec8 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
@@ -2650,7 +2650,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E
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 88b31c354c..3c77704977 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
@@ -2762,7 +2762,7 @@ ConstraintFixed,6
***********************************************************
** Outputs --> frd file
-*NODE FILE, OUTPUT=2d
+*NODE FILE, OUTPUT=3d
U
*EL FILE
S, E