FEM: example thermomech flow1d, move mesh from unit tests to fem exam…

…ples
FreeCAD · Sep 26, 2019 · bad8f9a · bad8f9a
1 parent 587612f
commit bad8f9a
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
@@ -48,6 +48,7 @@ SET(FemExampleMeshes_SRCS
     femexamples/meshes/mesh_canticcx_tetra10.py
     femexamples/meshes/mesh_rc_wall_2d_tria6.py
     femexamples/meshes/mesh_multimaterial_twoboxes.py
+    femexamples/meshes/mesh_thermomech_flow1d.py
     femexamples/meshes/mesh_thermomech_spine.py
 )
 
@@ -174,7 +175,6 @@ SET(FemTestsCcx_SRCS
     femtest/data/ccx/spine_thermomech.frd
     femtest/data/ccx/spine_thermomech_expected_values
     femtest/data/ccx/spine_thermomech.FCStd
-    femtest/data/ccx/Flow1D_mesh.py
     femtest/data/ccx/Flow1D_thermomech.inp
     femtest/data/ccx/Flow1D_thermomech.dat
     femtest/data/ccx/Flow1D_thermomech.frd

diff --git a/src/Mod/Fem/femtest/data/ccx/Flow1D_mesh.py → ...examples/meshes/mesh_thermomech_flow1d.py b/src/Mod/Fem/femtest/data/ccx/Flow1D_mesh.py → ...examples/meshes/mesh_thermomech_flow1d.py
@@ -1,4 +1,4 @@
-def create_nodes_Flow1D(femmesh):
+def create_nodes(femmesh):
     # nodes
     femmesh.addNode(0, 0, 50, 1)
     femmesh.addNode(0, 0, -50, 2)
@@ -31,7 +31,7 @@ def create_nodes_Flow1D(femmesh):
     return True
 
 
-def create_elements_Flow1D(femmesh):
+def create_elements(femmesh):
     # elements
     femmesh.addEdge([1, 2, 15], 1)
     femmesh.addEdge([2, 3, 16], 2)

diff --git a/src/Mod/Fem/femexamples/thermomech_flow1d.py b/src/Mod/Fem/femexamples/thermomech_flow1d.py
@@ -232,9 +232,7 @@ def setup(doc=None, solver="ccxtools"):
     Flow1d_self_weight.Gravity_z = -1.0
 
     # mesh
-    # from femexamples.meshes.mesh_thermomech_spine import create_nodes, create_elements
-    from femtest.data.ccx.Flow1D_mesh import create_nodes_Flow1D as create_nodes
-    from femtest.data.ccx.Flow1D_mesh import create_elements_Flow1D as create_elements
+    from .meshes.mesh_thermomech_flow1d import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control: