'FEM: examples, better file names for meshes

FreeCAD · Oct 8, 2019 · d780f7a · d780f7a
1 parent 1b3c41b
commit d780f7a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -47,13 +47,13 @@ SET(FemExamples_SRCS
 
 SET(FemExampleMeshes_SRCS
     femexamples/meshes/__init__.py
-    femexamples/meshes/mesh_boxanalysis.py
+    femexamples/meshes/mesh_boxanalysis_tetra10.py
     femexamples/meshes/mesh_boxes_2_vertikal_tetra10.py
     femexamples/meshes/mesh_canticcx_tetra10.py
     femexamples/meshes/mesh_rc_wall_2d_tria6.py
-    femexamples/meshes/mesh_platewithhole.py
-    femexamples/meshes/mesh_thermomech_flow1d.py
-    femexamples/meshes/mesh_thermomech_spine.py
+    femexamples/meshes/mesh_platewithhole_tetra10.py
+    femexamples/meshes/mesh_thermomech_flow1d_seg3.py
+    femexamples/meshes/mesh_thermomech_spine_tetra10.py
 )
 
 SET(FemInOut_SRCS

diff --git a/src/Mod/Fem/femexamples/boxanalysis.py b/src/Mod/Fem/femexamples/boxanalysis.py
@@ -66,7 +66,7 @@ def setup_base(doc=None, solvertype="ccxtools"):
     material_object.Material = mat
 
     # mesh
-    from .meshes.mesh_boxanalysis import create_nodes, create_elements
+    from .meshes.mesh_boxanalysis_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/material_nl_platewithhole.py b/src/Mod/Fem/femexamples/material_nl_platewithhole.py
@@ -138,7 +138,7 @@ def setup(doc=None, solvertype="ccxtools"):
     pressure_constraint.Reversed = True
 
     # mesh
-    from .meshes.mesh_platewithhole import create_nodes, create_elements
+    from .meshes.mesh_platewithhole_tetra10 import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control:

diff --git a/...em/femexamples/meshes/mesh_boxanalysis.py → ...amples/meshes/mesh_boxanalysis_tetra10.py b/...em/femexamples/meshes/mesh_boxanalysis.py → ...amples/meshes/mesh_boxanalysis_tetra10.py
diff --git a/.../femexamples/meshes/mesh_platewithhole.py → ...ples/meshes/mesh_platewithhole_tetra10.py b/.../femexamples/meshes/mesh_platewithhole.py → ...ples/meshes/mesh_platewithhole_tetra10.py
diff --git a/...examples/meshes/mesh_thermomech_flow1d.py → ...les/meshes/mesh_thermomech_flow1d_seg3.py b/...examples/meshes/mesh_thermomech_flow1d.py → ...les/meshes/mesh_thermomech_flow1d_seg3.py
diff --git a/...mexamples/meshes/mesh_thermomech_spine.py → ...s/meshes/mesh_thermomech_spine_tetra10.py b/...mexamples/meshes/mesh_thermomech_spine.py → ...s/meshes/mesh_thermomech_spine_tetra10.py
diff --git a/src/Mod/Fem/femexamples/thermomech_flow1d.py b/src/Mod/Fem/femexamples/thermomech_flow1d.py
@@ -231,7 +231,7 @@ def setup(doc=None, solvertype="ccxtools"):
     self_weight.Gravity_z = -1.0
 
     # mesh
-    from .meshes.mesh_thermomech_flow1d import create_nodes, create_elements
+    from .meshes.mesh_thermomech_flow1d_seg3 import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control:

diff --git a/src/Mod/Fem/femexamples/thermomech_spine.py b/src/Mod/Fem/femexamples/thermomech_spine.py
@@ -124,7 +124,7 @@ def setup(doc=None, solvertype="ccxtools"):
     heatflux_constraint.FilmCoef = 5.678
 
     # mesh
-    from .meshes.mesh_thermomech_spine import create_nodes, create_elements
+    from .meshes.mesh_thermomech_spine_tetra10 import create_nodes, create_elements
     fem_mesh = Fem.FemMesh()
     control = create_nodes(fem_mesh)
     if not control: