diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 4ff7364a4d..9bcaf04f8e 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -48,10 +48,15 @@ SET(FemExamples_SRCS femexamples/buckling_platebuckling.py femexamples/buckling_lateraltorsionalbuckling.py femexamples/ccx_buckling_flexuralbuckling.py - femexamples/ccx_cantilever_base.py + femexamples/ccx_cantilever_base_face.py + femexamples/ccx_cantilever_base_solid.py + femexamples/ccx_cantilever_ele_hexa20.py + femexamples/ccx_cantilever_ele_tetra4.py + femexamples/ccx_cantilever_ele_tria3.py + femexamples/ccx_cantilever_ele_tria6.py + femexamples/ccx_cantilever_ele_seg3.py femexamples/ccx_cantilever_faceload.py femexamples/ccx_cantilever_nodeload.py - femexamples/ccx_cantilever_hexa20faceload.py femexamples/ccx_cantilever_prescribeddisplacement.py femexamples/constraint_centrif.py femexamples/constraint_contact_shell_shell.py @@ -87,7 +92,9 @@ SET(FemExampleMeshes_SRCS femexamples/meshes/mesh_buckling_ibeam_tria6.py femexamples/meshes/mesh_buckling_plate_tria6.py femexamples/meshes/mesh_canticcx_hexa20.py + femexamples/meshes/mesh_canticcx_seg3.py femexamples/meshes/mesh_canticcx_tetra10.py + femexamples/meshes/mesh_canticcx_tria6.py femexamples/meshes/mesh_capacitance_two_balls_tetra10.py femexamples/meshes/mesh_constraint_centrif_tetra10.py femexamples/meshes/mesh_constraint_tie_tetra10.py @@ -287,10 +294,10 @@ SET(FemTestsCcx_SRCS femtest/data/calculix/box.FCStd femtest/data/calculix/ccx_buckling_flexuralbuckling.dat femtest/data/calculix/ccx_buckling_flexuralbuckling.inp - femtest/data/calculix/ccxcantilever_faceload.inp - femtest/data/calculix/ccxcantilever_hexa20.inp - femtest/data/calculix/ccxcantilever_nodeload.inp - femtest/data/calculix/ccxcantilever_prescribeddisplacement.inp + femtest/data/calculix/ccx_cantilever_faceload.inp + femtest/data/calculix/ccx_cantilever_ele_hexa20.inp + femtest/data/calculix/ccx_cantilever_nodeload.inp + femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp femtest/data/calculix/constraint_centrif.inp femtest/data/calculix/constraint_contact_shell_shell.FCStd femtest/data/calculix/constraint_contact_shell_shell.inp @@ -353,41 +360,41 @@ SET(FemTestsZ88Main_SRCS SET(FemTestsZ88Ccxcantifl_SRCS femtest/data/z88/__init__.py - femtest/data/z88/ccxcantilever_faceload/51.txt - femtest/data/z88/ccxcantilever_faceload/z88.dyn - femtest/data/z88/ccxcantilever_faceload/z88elp.txt - femtest/data/z88/ccxcantilever_faceload/z88i1.txt - femtest/data/z88/ccxcantilever_faceload/z88i2.txt - femtest/data/z88/ccxcantilever_faceload/z88i5.txt - femtest/data/z88/ccxcantilever_faceload/z88int.txt - femtest/data/z88/ccxcantilever_faceload/z88man.txt - femtest/data/z88/ccxcantilever_faceload/z88mat.txt + femtest/data/z88/ccx_cantilever_faceload/51.txt + femtest/data/z88/ccx_cantilever_faceload/z88.dyn + femtest/data/z88/ccx_cantilever_faceload/z88elp.txt + femtest/data/z88/ccx_cantilever_faceload/z88i1.txt + femtest/data/z88/ccx_cantilever_faceload/z88i2.txt + femtest/data/z88/ccx_cantilever_faceload/z88i5.txt + femtest/data/z88/ccx_cantilever_faceload/z88int.txt + femtest/data/z88/ccx_cantilever_faceload/z88man.txt + femtest/data/z88/ccx_cantilever_faceload/z88mat.txt ) SET(FemTestsZ88Ccxcantihex_SRCS femtest/data/z88/__init__.py - femtest/data/z88/ccxcantilever_hexa20/51.txt - femtest/data/z88/ccxcantilever_hexa20/z88.dyn - femtest/data/z88/ccxcantilever_hexa20/z88elp.txt - femtest/data/z88/ccxcantilever_hexa20/z88i1.txt - femtest/data/z88/ccxcantilever_hexa20/z88i2.txt - femtest/data/z88/ccxcantilever_hexa20/z88i5.txt - femtest/data/z88/ccxcantilever_hexa20/z88int.txt - femtest/data/z88/ccxcantilever_hexa20/z88man.txt - femtest/data/z88/ccxcantilever_hexa20/z88mat.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/51.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88.dyn + femtest/data/z88/ccx_cantilever_ele_hexa20/z88elp.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88i1.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88i2.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88i5.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88int.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88man.txt + femtest/data/z88/ccx_cantilever_ele_hexa20/z88mat.txt ) SET(FemTestsZ88Ccxcantinl_SRCS femtest/data/z88/__init__.py - femtest/data/z88/ccxcantilever_nodeload/51.txt - femtest/data/z88/ccxcantilever_nodeload/z88.dyn - femtest/data/z88/ccxcantilever_nodeload/z88elp.txt - femtest/data/z88/ccxcantilever_nodeload/z88i1.txt - femtest/data/z88/ccxcantilever_nodeload/z88i2.txt - femtest/data/z88/ccxcantilever_nodeload/z88i5.txt - femtest/data/z88/ccxcantilever_nodeload/z88int.txt - femtest/data/z88/ccxcantilever_nodeload/z88man.txt - femtest/data/z88/ccxcantilever_nodeload/z88mat.txt + femtest/data/z88/ccx_cantilever_nodeload/51.txt + femtest/data/z88/ccx_cantilever_nodeload/z88.dyn + femtest/data/z88/ccx_cantilever_nodeload/z88elp.txt + femtest/data/z88/ccx_cantilever_nodeload/z88i1.txt + femtest/data/z88/ccx_cantilever_nodeload/z88i2.txt + femtest/data/z88/ccx_cantilever_nodeload/z88i5.txt + femtest/data/z88/ccx_cantilever_nodeload/z88int.txt + femtest/data/z88/ccx_cantilever_nodeload/z88man.txt + femtest/data/z88/ccx_cantilever_nodeload/z88mat.txt ) SET(FemTools_SRCS @@ -462,9 +469,9 @@ INSTALL(FILES ${FemTestsElmer_SRCS} DESTINATION Mod/Fem/femtest/data/elmer) INSTALL(FILES ${FemTestsMesh_SRCS} DESTINATION Mod/Fem/femtest/data/mesh) INSTALL(FILES ${FemTestsOpen_SRCS} DESTINATION Mod/Fem/femtest/data/open) INSTALL(FILES ${FemTestsZ88Main_SRCS} DESTINATION Mod/Fem/femtest/data/z88) -INSTALL(FILES ${FemTestsZ88Ccxcantifl_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccxcantilever_faceload) -INSTALL(FILES ${FemTestsZ88Ccxcantihex_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccxcantilever_hexa20) -INSTALL(FILES ${FemTestsZ88Ccxcantinl_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccxcantilever_nodeload) +INSTALL(FILES ${FemTestsZ88Ccxcantifl_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccx_cantilever_faceload) +INSTALL(FILES ${FemTestsZ88Ccxcantihex_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20) +INSTALL(FILES ${FemTestsZ88Ccxcantinl_SRCS} DESTINATION Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload) INSTALL(FILES ${FemTools_SRCS} DESTINATION Mod/Fem/femtools) diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_base.py b/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py similarity index 98% rename from src/Mod/Fem/femexamples/ccx_cantilever_base.py rename to src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py index c3d1d7da51..46e9327509 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_base.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py @@ -31,7 +31,7 @@ from .manager import get_meshname from .manager import init_doc -def setup_cantileverbase(doc=None, solvertype="ccxtools"): +def setup_cantilever_base_solid(doc=None, solvertype="ccxtools"): # init FreeCAD document if doc is None: diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_hexa20faceload.py b/src/Mod/Fem/femexamples/ccx_cantilever_ele_hexa20.py similarity index 97% rename from src/Mod/Fem/femexamples/ccx_cantilever_hexa20faceload.py rename to src/Mod/Fem/femexamples/ccx_cantilever_ele_hexa20.py index 62f5252903..0e7c6d9aeb 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_hexa20faceload.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_ele_hexa20.py @@ -34,7 +34,7 @@ from .manager import init_doc def get_information(): return { - "name": "CCX cantilever hexa20 face load", + "name": "CCX cantilever hexa20 solid elements", "meshtype": "solid", "meshelement": "Hexa20", "constraints": ["fixed", "force"], @@ -53,6 +53,7 @@ setup() See forum topic post: +hexa20 elements and face load ... """ diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_faceload.py b/src/Mod/Fem/femexamples/ccx_cantilever_faceload.py index 249be5a176..fe0a444388 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_faceload.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_faceload.py @@ -25,7 +25,7 @@ import ObjectsFem from . import manager -from .ccx_cantilever_base import setup_cantileverbase +from .ccx_cantilever_base_solid import setup_cantilever_base_solid from .manager import init_doc @@ -65,8 +65,8 @@ def setup(doc=None, solvertype="ccxtools"): # just keep the following line and change text string in get_explanation method manager.add_explanation_obj(doc, get_explanation(manager.get_header(get_information()))) - # setup CalculiX cantilever, apply 9 MN on surface of front end face - doc = setup_cantileverbase(doc, solvertype) + # setup CalculiX cantilever + doc = setup_cantilever_base_solid(doc, solvertype) analysis = doc.Analysis geom_obj = doc.Box diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_nodeload.py b/src/Mod/Fem/femexamples/ccx_cantilever_nodeload.py index b34367e3bb..e52ce68a53 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_nodeload.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_nodeload.py @@ -25,7 +25,7 @@ import ObjectsFem from . import manager -from .ccx_cantilever_base import setup_cantileverbase +from .ccx_cantilever_base_solid import setup_cantilever_base_solid from .manager import init_doc @@ -66,7 +66,7 @@ def setup(doc=None, solvertype="ccxtools"): manager.add_explanation_obj(doc, get_explanation(manager.get_header(get_information()))) # setup CalculiX cantilever, apply 9 MN on the 4 nodes of the front end face - doc = setup_cantileverbase(doc, solvertype) + doc = setup_cantilever_base_solid(doc, solvertype) analysis = doc.Analysis geom_obj = doc.Box diff --git a/src/Mod/Fem/femexamples/ccx_cantilever_prescribeddisplacement.py b/src/Mod/Fem/femexamples/ccx_cantilever_prescribeddisplacement.py index 6308d8fd9f..8b601737a5 100644 --- a/src/Mod/Fem/femexamples/ccx_cantilever_prescribeddisplacement.py +++ b/src/Mod/Fem/femexamples/ccx_cantilever_prescribeddisplacement.py @@ -25,7 +25,7 @@ import ObjectsFem from . import manager -from .ccx_cantilever_base import setup_cantileverbase +from .ccx_cantilever_base_solid import setup_cantilever_base_solid from .manager import init_doc @@ -72,7 +72,7 @@ def setup(doc=None, solvertype="ccxtools"): # setup CalculiX cantilever # apply a prescribed displacement of 250 mm in -z on the front end face - doc = setup_cantileverbase(doc, solvertype) + doc = setup_cantilever_base_solid(doc, solvertype) analysis = doc.Analysis geom_obj = doc.Box diff --git a/src/Mod/Fem/femtest/app/test_solver_calculix.py b/src/Mod/Fem/femtest/app/test_solver_calculix.py index 6676343f54..42a2580431 100644 --- a/src/Mod/Fem/femtest/app/test_solver_calculix.py +++ b/src/Mod/Fem/femtest/app/test_solver_calculix.py @@ -104,7 +104,7 @@ class TestSolverCalculix(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_faceload( + def test_ccx_cantilever_faceload( self ): from femexamples.ccx_cantilever_faceload import setup @@ -112,15 +112,15 @@ class TestSolverCalculix(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_hexa20( + def test_ccx_cantilever_ele_hexa20( self ): - from femexamples.ccx_cantilever_hexa20faceload import setup + from femexamples.ccx_cantilever_ele_hexa20 import setup setup(self.document, "calculix") self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_nodeload( + def test_ccx_cantilever_nodeload( self ): from femexamples.ccx_cantilever_nodeload import setup @@ -128,7 +128,7 @@ class TestSolverCalculix(unittest.TestCase): self.input_file_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_prescribeddisplacement( + def test_ccx_cantilever_prescribeddisplacement( self ): from femexamples.ccx_cantilever_prescribeddisplacement import setup diff --git a/src/Mod/Fem/femtest/app/test_solver_z88.py b/src/Mod/Fem/femtest/app/test_solver_z88.py index bcfd38f0fc..9b69c77216 100644 --- a/src/Mod/Fem/femtest/app/test_solver_z88.py +++ b/src/Mod/Fem/femtest/app/test_solver_z88.py @@ -76,7 +76,7 @@ class TestSolverZ88(unittest.TestCase): )) # ******************************************************************************************** - def test_ccxcantilever_faceload( + def test_ccx_cantilever_faceload( self ): from femexamples.ccx_cantilever_faceload import setup @@ -84,15 +84,15 @@ class TestSolverZ88(unittest.TestCase): self.inputfile_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_hexa20( + def test_ccx_cantilever_ele_hexa20( self ): - from femexamples.ccx_cantilever_hexa20faceload import setup + from femexamples.ccx_cantilever_ele_hexa20 import setup setup(self.document, "z88") self.inputfile_writing_test(get_namefromdef("test_")) # ******************************************************************************************** - def test_ccxcantilever_nodeload( + def test_ccx_cantilever_nodeload( self ): from femexamples.ccx_cantilever_nodeload import setup diff --git a/src/Mod/Fem/femtest/data/calculix/ccxcantilever_hexa20.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp similarity index 100% rename from src/Mod/Fem/femtest/data/calculix/ccxcantilever_hexa20.inp rename to src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp diff --git a/src/Mod/Fem/femtest/data/calculix/ccxcantilever_faceload.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp similarity index 100% rename from src/Mod/Fem/femtest/data/calculix/ccxcantilever_faceload.inp rename to src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp diff --git a/src/Mod/Fem/femtest/data/calculix/ccxcantilever_nodeload.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp similarity index 100% rename from src/Mod/Fem/femtest/data/calculix/ccxcantilever_nodeload.inp rename to src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp diff --git a/src/Mod/Fem/femtest/data/calculix/ccxcantilever_prescribeddisplacement.inp b/src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp similarity index 100% rename from src/Mod/Fem/femtest/data/calculix/ccxcantilever_prescribeddisplacement.inp rename to src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/51.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/51.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/51.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/51.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88.dyn b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88.dyn similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88.dyn rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88.dyn diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88elp.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88elp.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88elp.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88elp.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i1.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i1.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i1.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i1.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i2.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i2.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i2.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i2.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i5.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i5.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i5.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88i5.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88int.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88int.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88int.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88int.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88man.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88man.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88man.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88man.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88mat.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88mat.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88mat.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_ele_hexa20/z88mat.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/51.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/51.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/51.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/51.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88.dyn b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88.dyn similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88.dyn rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88.dyn diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88elp.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88elp.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88elp.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88elp.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i1.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i1.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i1.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i1.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i2.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i2.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88i2.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i2.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i5.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i5.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88i5.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88i5.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88int.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88int.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88int.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88int.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88man.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88man.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_hexa20/z88man.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88man.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88mat.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88mat.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_faceload/z88mat.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_faceload/z88mat.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/51.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/51.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/51.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/51.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88.dyn b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88.dyn similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88.dyn rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88.dyn diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88elp.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88elp.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88elp.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88elp.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i1.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i1.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i1.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i1.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i2.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i2.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i2.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i2.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i5.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i5.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88i5.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88i5.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88int.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88int.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88int.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88int.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88man.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88man.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88man.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88man.txt diff --git a/src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88mat.txt b/src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88mat.txt similarity index 100% rename from src/Mod/Fem/femtest/data/z88/ccxcantilever_nodeload/z88mat.txt rename to src/Mod/Fem/femtest/data/z88/ccx_cantilever_nodeload/z88mat.txt