From 5a84dc27cb508eb0b81eea44f5b93ada28730e97 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 25 Sep 2019 09:12:19 +0200 Subject: [PATCH] FEM: example thermomech spine, move mesh from unit tests to fem examples --- src/Mod/Fem/CMakeLists.txt | 2 +- .../meshes/mesh_thermomech_spine.py} | 4 ++-- src/Mod/Fem/femexamples/thermomech_spine.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) rename src/Mod/Fem/{femtest/data/ccx/spine_mesh.py => femexamples/meshes/mesh_thermomech_spine.py} (97%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 1284bf0e2b..22c96868cb 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -45,6 +45,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_thermomech_spine.py ) SET(FemInOut_SRCS @@ -166,7 +167,6 @@ SET(FemTestsCcx_SRCS femtest/data/ccx/cube.FCStd femtest/data/ccx/multimat.inp femtest/data/ccx/multimat_mesh.py - femtest/data/ccx/spine_mesh.py femtest/data/ccx/spine_thermomech.inp femtest/data/ccx/spine_thermomech.dat femtest/data/ccx/spine_thermomech.frd diff --git a/src/Mod/Fem/femtest/data/ccx/spine_mesh.py b/src/Mod/Fem/femexamples/meshes/mesh_thermomech_spine.py similarity index 97% rename from src/Mod/Fem/femtest/data/ccx/spine_mesh.py rename to src/Mod/Fem/femexamples/meshes/mesh_thermomech_spine.py index 5399eacf5d..42f08dafe3 100644 --- a/src/Mod/Fem/femtest/data/ccx/spine_mesh.py +++ b/src/Mod/Fem/femexamples/meshes/mesh_thermomech_spine.py @@ -1,4 +1,4 @@ -def create_nodes_spine(femmesh): +def create_nodes(femmesh): # nodes femmesh.addNode(203.2, 25.4, 0.0, 1) femmesh.addNode(203.2, 25.4, 25.4, 2) @@ -48,7 +48,7 @@ def create_nodes_spine(femmesh): return True -def create_elements_spine(femmesh): +def create_elements(femmesh): # elements femmesh.addVolume([6, 5, 12, 11, 26, 33, 43, 37, 20, 34], 1) femmesh.addVolume([12, 9, 11, 2, 44, 39, 34, 45, 15, 38], 2) diff --git a/src/Mod/Fem/femexamples/thermomech_spine.py b/src/Mod/Fem/femexamples/thermomech_spine.py index cac57f881c..7c373ac7c1 100644 --- a/src/Mod/Fem/femexamples/thermomech_spine.py +++ b/src/Mod/Fem/femexamples/thermomech_spine.py @@ -124,9 +124,7 @@ def setup(doc=None, solver="ccxtools"): heatflux_constraint.FilmCoef = 5.678 # mesh - # from femexamples.meshes.mesh_canticcx_tetra10 import create_nodes, create_elements - from femtest.data.ccx.spine_mesh import create_nodes_spine as create_nodes - from femtest.data.ccx.spine_mesh import create_elements_spine as create_elements + from femexamples.meshes.mesh_thermomech_spine import create_nodes, create_elements fem_mesh = Fem.FemMesh() control = create_nodes(fem_mesh) if not control: