From 8dad4303f41ca4df55cb09c04a504437f95eaed8 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 31 Mar 2019 15:08:23 +0200 Subject: [PATCH] FEM: examples, move meshes in sparate directory --- src/Mod/Fem/CMakeLists.txt | 8 +++++++- src/Mod/Fem/femexamples/ccx_cantilever_std.py | 2 +- src/Mod/Fem/femexamples/meshes/__init__.py | 0 .../Fem/femexamples/{ => meshes}/mesh_canticcx_tetra10.py | 0 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/Mod/Fem/femexamples/meshes/__init__.py rename src/Mod/Fem/femexamples/{ => meshes}/mesh_canticcx_tetra10.py (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 8b08e978ad..1751731e68 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -36,7 +36,11 @@ SET(FemExamples_SRCS femexamples/__init__.py femexamples/ccx_cantilever_std.py femexamples/manager.py - femexamples/mesh_canticcx_tetra10.py +) + +SET(FemExampleMeshes_SRCS + femexamples/meshes/__init__.py + femexamples/meshes/mesh_canticcx_tetra10.py ) SET(FemInOut_SRCS @@ -214,6 +218,7 @@ SET(FemAllScripts ${FemScripts_SRCS} ${FemCommands_SRCS} ${FemExamples_SRCS} + ${FemExampleMeshes_SRCS} ${FemInOut_SRCS} ${FemMesh_SRCS} ${FemResult_SRCS} @@ -244,6 +249,7 @@ fc_copy_sources(FemScriptsTarget "${CMAKE_BINARY_DIR}/Mod/Fem" ${FemAllScripts}) INSTALL(FILES ${FemScripts_SRCS} DESTINATION Mod/Fem) INSTALL(FILES ${FemCommands_SRCS} DESTINATION Mod/Fem/femcommands) INSTALL(FILES ${FemExamples_SRCS} DESTINATION Mod/Fem/femexamples) +INSTALL(FILES ${FemExampleMeshes_SRCS} DESTINATION Mod/Fem/femexamples/meshes) INSTALL(FILES ${FemInOut_SRCS} DESTINATION Mod/Fem/feminout) INSTALL(FILES ${FemMesh_SRCS} DESTINATION Mod/Fem/femmesh) INSTALL(FILES ${FemResult_SRCS} DESTINATION Mod/Fem/femresult) diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_std.py b/src/Mod/Fem/femexamples/ccx_cantilever_std.py index 7f3cfb3250..38bfa87f9e 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_std.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_std.py @@ -88,7 +88,7 @@ def setup_cantileverbase(doc=None, solver='ccxtools'): fixed_constraint.References = [(doc.Box, "Face1")] # mesh - from femexamples.mesh_canticcx_tetra10 import create_nodes, create_elements + from femexamples.meshes.mesh_canticcx_tetra10 import create_nodes, create_elements fem_mesh = Fem.FemMesh() control = create_nodes(fem_mesh) if not control: diff --git a/src/Mod/Fem/femexamples/meshes/__init__.py b/src/Mod/Fem/femexamples/meshes/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Fem/femexamples/mesh_canticcx_tetra10.py b/src/Mod/Fem/femexamples/meshes/mesh_canticcx_tetra10.py similarity index 100% rename from src/Mod/Fem/femexamples/mesh_canticcx_tetra10.py rename to src/Mod/Fem/femexamples/meshes/mesh_canticcx_tetra10.py