FEM: example multimaterial, move mesh from unit tests to fem examples

FreeCAD · Sep 25, 2019 · b1765cf · b1765cf
1 parent 9270111
commit b1765cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -46,6 +46,7 @@ SET(FemExampleMeshes_SRCS
     femexamples/meshes/__init__.py
     femexamples/meshes/mesh_canticcx_tetra10.py
     femexamples/meshes/mesh_rc_wall_2d_tria6.py
+    femexamples/meshes/mesh_multimaterial_twoboxes.py
     femexamples/meshes/mesh_thermomech_spine.py
 )
 
@@ -167,7 +168,6 @@ SET(FemTestsCcx_SRCS
     femtest/data/ccx/cube_static.FCStd
     femtest/data/ccx/cube.FCStd
     femtest/data/ccx/multimat.inp
-    femtest/data/ccx/multimat_mesh.py
     femtest/data/ccx/spine_thermomech.inp
     femtest/data/ccx/spine_thermomech.dat
     femtest/data/ccx/spine_thermomech.frd

diff --git a/...Mod/Fem/femtest/data/ccx/multimat_mesh.py → ...les/meshes/mesh_multimaterial_twoboxes.py b/...Mod/Fem/femtest/data/ccx/multimat_mesh.py → ...les/meshes/mesh_multimaterial_twoboxes.py
diff --git a/src/Mod/Fem/femexamples/multimaterial_twoboxes.py b/src/Mod/Fem/femexamples/multimaterial_twoboxes.py
@@ -144,7 +144,7 @@ def setup(doc=None, solver="ccxtools"):
 
     # mesh
     # from femexamples.meshes.mesh_thermomech_spine import create_nodes, create_elements
-    from  femtest.data.ccx.multimat_mesh import create_nodes, create_elements
+    from  femexamples.meshes.mesh_multimaterial_twoboxes import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control: