diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 44249c55a2..48b2d5c3a6 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -6,9 +6,7 @@ SET(Examples_Files PartDesignExample.FCStd RobotExample.FCStd BIMExample.FCStd - FemCalculixCantilever1D.FCStd - FemCalculixCantilever2D.FCStd - FemCalculixCantilever3D.FCStd + FEMExample.FCStd AssemblyExample.FCStd ) diff --git a/data/examples/FEMExample.FCStd b/data/examples/FEMExample.FCStd new file mode 100644 index 0000000000..26e8107788 Binary files /dev/null and b/data/examples/FEMExample.FCStd differ diff --git a/data/examples/FemCalculixCantilever1D.FCStd b/data/examples/FemCalculixCantilever1D.FCStd deleted file mode 100644 index 4f06671d77..0000000000 Binary files a/data/examples/FemCalculixCantilever1D.FCStd and /dev/null differ diff --git a/data/examples/FemCalculixCantilever2D.FCStd b/data/examples/FemCalculixCantilever2D.FCStd deleted file mode 100644 index 4add374146..0000000000 Binary files a/data/examples/FemCalculixCantilever2D.FCStd and /dev/null differ diff --git a/data/examples/FemCalculixCantilever3D.FCStd b/data/examples/FemCalculixCantilever3D.FCStd deleted file mode 100644 index 87eb438412..0000000000 Binary files a/data/examples/FemCalculixCantilever3D.FCStd and /dev/null differ diff --git a/src/Mod/Fem/femmesh/femmesh2mesh.py b/src/Mod/Fem/femmesh/femmesh2mesh.py index c9061d0edd..71cbbd6c80 100644 --- a/src/Mod/Fem/femmesh/femmesh2mesh.py +++ b/src/Mod/Fem/femmesh/femmesh2mesh.py @@ -42,9 +42,9 @@ import Fem """ from os.path import join -the_file = join(FreeCAD.getResourceDir(), "examples", "FemCalculixCantilever3D.FCStd") +the_file = join(FreeCAD.getResourceDir(), "examples", "FEMExample.FCStd") fc_file = FreeCAD.openDocument(the_file) -fem_mesh = fc_file.getObject("Box_Mesh").FemMesh # do not remove the _ +fem_mesh = fc_file.getObject("FEMMeshGmsh").FemMesh result = fc_file.getObject("CCX_Results") scale = 1 # displacement scale factor from femmesh import femmesh2mesh diff --git a/src/Mod/Fem/femtest/app/test_result.py b/src/Mod/Fem/femtest/app/test_result.py index 59736b63fa..0ecef33431 100644 --- a/src/Mod/Fem/femtest/app/test_result.py +++ b/src/Mod/Fem/femtest/app/test_result.py @@ -59,21 +59,7 @@ class TestResult(unittest.TestCase): # ******************************************************************************************** def get_stress_values(self): - # node 5 von calculix cantilver 3D example - # doc = FreeCAD.open( - # FreeCAD.ConfigGet("AppHomePath") + "data/examples/FemCalculixCantilever3D.FCStd" - # ) - # doc.Box_Mesh.FemMesh.Nodes[5] - # Vector (0.0, 1000.0, 0.0) - # res = doc.CalculiX_static_results - # stress = ( - # res.NodeStressXX[4], - # res.NodeStressYY[4], - # res.NodeStressZZ[4], - # res.NodeStressXY[4], - # res.NodeStressXZ[4], - # res.NodeStressYZ[4] - # ) + # stress at node 4 of CalculiX cantilever face load stress = ( -4.52840e02, # Sxx -1.94075e02, # Syy @@ -196,7 +182,7 @@ class TestResult(unittest.TestCase): # ******************************************************************************************** def test_disp_abs(self): expected_dispabs = 87.302986 - # x, y, z in node 4 of CalculiX cantilver face load + # x, y, z at node 4 of CalculiX cantilever face load disp_xyz = [FreeCAD.Vector(8.12900e00, 3.38889e-02, -8.69237e01)] from femresult.resulttools import calculate_disp_abs as dp diff --git a/src/Mod/Fem/femtest/test_information.md b/src/Mod/Fem/femtest/test_information.md index e2a3567ecf..1aea8604ac 100644 --- a/src/Mod/Fem/femtest/test_information.md +++ b/src/Mod/Fem/femtest/test_information.md @@ -157,11 +157,7 @@ doc = ut.spine_thermomech() ```python app_home = FreeCAD.ConfigGet("AppHomePath") -doc = FreeCAD.open(app_home + "data/examples/FemCalculixCantilever2D.FCStd") -doc = FreeCAD.open(app_home + "data/examples/FemCalculixCantilever3D.FCStd") -doc = FreeCAD.open(app_home + "data/examples/FemCalculixCantilever3D_newSolver.FCStd") -doc = FreeCAD.open(app_home + "data/examples/Fem.FCStd") -doc = FreeCAD.open(app_home + "data/examples/Fem2.FCStd") +doc = FreeCAD.open(app_home + "data/examples/FEMExample.FCStd") ``` ### Load all documents files diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index ee8f1f9d02..63b1ab0a41 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -980,7 +980,7 @@ import MaterialEditor MaterialEditor.openEditor() doc = FreeCAD.open( - FreeCAD.ConfigGet("AppHomePath") + "data/examples/FemCalculixCantilever3D.FCStd" + FreeCAD.ConfigGet("AppHomePath") + "data/examples/FEMExample.FCStd" ) import MaterialEditor MaterialEditor.openEditor("SolidMaterial", "Material")