FEM: examples simple box static and frequency, move mesh from unit te…

…sts to fem examples
FreeCAD · Sep 26, 2019 · bc29bcf · bc29bcf
1 parent 3acb7d9
commit bc29bcf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -46,6 +46,7 @@ SET(FemExamples_SRCS
 
 SET(FemExampleMeshes_SRCS
     femexamples/meshes/__init__.py
+    femexamples/meshes/mesh_boxanalysis.py
     femexamples/meshes/mesh_canticcx_tetra10.py
     femexamples/meshes/mesh_rc_wall_2d_tria6.py
     femexamples/meshes/mesh_multimaterial_twoboxes.py
@@ -158,7 +159,6 @@ SET(FemTestsFiles_SRCS
 
 SET(FemTestsCcx_SRCS
     femtest/data/ccx/__init__.py
-    femtest/data/ccx/cube_mesh.py
     femtest/data/ccx/cube_frequency.inp
     femtest/data/ccx/cube_frequency.dat
     femtest/data/ccx/cube_frequency.frd

diff --git a/src/Mod/Fem/femexamples/boxanalysis.py b/src/Mod/Fem/femexamples/boxanalysis.py
@@ -66,9 +66,7 @@ def setup_base(doc=None, solver="ccxtools"):
     material_object.Material = mat
 
     # mesh
-    # from .meshes.mesh_canticcx_tetra10 import create_nodes, create_elements
-    from femtest.data.ccx.cube_mesh import create_nodes_cube as create_nodes
-    from femtest.data.ccx.cube_mesh import create_elements_cube as create_elements
+    from .meshes.mesh_boxanalysis import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control:

diff --git a/src/Mod/Fem/femtest/data/ccx/cube_mesh.py → ...em/femexamples/meshes/mesh_boxanalysis.py b/src/Mod/Fem/femtest/data/ccx/cube_mesh.py → ...em/femexamples/meshes/mesh_boxanalysis.py
@@ -1,4 +1,4 @@
-def create_nodes_cube(femmesh):
+def create_nodes(femmesh):
     # nodes
     femmesh.addNode(0.0, 0.0, 0.0, 1)
     femmesh.addNode(0.0, 0.0, 10.0, 2)
@@ -283,7 +283,7 @@ def create_nodes_cube(femmesh):
     return True
 
 
-def create_elements_cube(femmesh):
+def create_elements(femmesh):
     # elements
     femmesh.addVolume([98, 95, 47, 196, 103, 198, 197, 199, 200, 201], 1)
     femmesh.addVolume([121, 147, 145, 196, 203, 161, 202, 204, 205, 206], 2)