FEM: ccx unit test data, rename to calculix and rename some data files

src/Mod/Fem/CMakeLists.txt

@@ -217,39 +217,39 @@ SET(FemTestsFiles_SRCS
 )
 
 SET(FemTestsCcx_SRCS
-    femtest/data/ccx/__init__.py
-    femtest/data/ccx/canti_ccx_faceload_hexa20.inp
-    femtest/data/ccx/constraint_contact_shell_shell.FCStd
-    femtest/data/ccx/constraint_contact_shell_shell.inp
-    femtest/data/ccx/constraint_contact_solid_solid.FCStd
-    femtest/data/ccx/constraint_contact_solid_solid.inp
-    femtest/data/ccx/constraint_sectionprint.inp
-    femtest/data/ccx/constraint_tie.inp
-    femtest/data/ccx/cube_frequency.inp
-    femtest/data/ccx/cube_frequency.dat
-    femtest/data/ccx/cube_frequency.frd
-    femtest/data/ccx/cube_frequency_expected_values
-    femtest/data/ccx/cube_frequency.FCStd
-    femtest/data/ccx/cube_static.inp
-    femtest/data/ccx/cube_static.dat
-    femtest/data/ccx/cube_static.frd
-    femtest/data/ccx/cube_static_expected_values
-    femtest/data/ccx/cube_static.FCStd
-    femtest/data/ccx/cube.FCStd
-    femtest/data/ccx/mat_multiple.inp
-    femtest/data/ccx/mat_nonlinear.inp
-    femtest/data/ccx/spine_thermomech.inp
-    femtest/data/ccx/spine_thermomech.dat
-    femtest/data/ccx/spine_thermomech.frd
-    femtest/data/ccx/spine_thermomech_expected_values
-    femtest/data/ccx/spine_thermomech.FCStd
-    femtest/data/ccx/Flow1D_thermomech.inp
-    femtest/data/ccx/Flow1D_thermomech.dat
-    femtest/data/ccx/Flow1D_thermomech.frd
-    femtest/data/ccx/Flow1D_thermomech_expected_values
-    femtest/data/ccx/Flow1D_thermomech_inout_nodes.txt
-    femtest/data/ccx/Flow1D_thermomech.FCStd
-    femtest/data/ccx/thermomech_bimetall.inp
+    femtest/data/calculix/__init__.py
+    femtest/data/calculix/box_frequency.inp
+    femtest/data/calculix/box_frequency.dat
+    femtest/data/calculix/box_frequency.frd
+    femtest/data/calculix/box_frequency_expected_values
+    femtest/data/calculix/box_frequency.FCStd
+    femtest/data/calculix/box_static.inp
+    femtest/data/calculix/box_static.dat
+    femtest/data/calculix/box_static.frd
+    femtest/data/calculix/box_static_expected_values
+    femtest/data/calculix/box_static.FCStd
+    femtest/data/calculix/box.FCStd
+    femtest/data/calculix/ccxcantilever_hexa20.inp
+    femtest/data/calculix/constraint_contact_shell_shell.FCStd
+    femtest/data/calculix/constraint_contact_shell_shell.inp
+    femtest/data/calculix/constraint_contact_solid_solid.FCStd
+    femtest/data/calculix/constraint_contact_solid_solid.inp
+    femtest/data/calculix/constraint_sectionprint.inp
+    femtest/data/calculix/constraint_tie.inp
+    femtest/data/calculix/material_multiple.inp
+    femtest/data/calculix/material_nonlinear.inp
+    femtest/data/calculix/thermomech_bimetall.inp
+    femtest/data/calculix/thermomech_flow1D.inp
+    femtest/data/calculix/thermomech_flow1D.dat
+    femtest/data/calculix/thermomech_flow1D.frd
+    femtest/data/calculix/thermomech_flow1D_expected_values
+    femtest/data/calculix/thermomech_flow1D_inout_nodes.txt
+    femtest/data/calculix/thermomech_flow1D.FCStd
+    femtest/data/calculix/thermomech_spine.inp
+    femtest/data/calculix/thermomech_spine.dat
+    femtest/data/calculix/thermomech_spine.frd
+    femtest/data/calculix/thermomech_spine_expected_values
+    femtest/data/calculix/thermomech_spine.FCStd
 )
 
 SET(FemTestsElmer_SRCS

src/Mod/Fem/femtest/app/test_ccxtools.py

@@ -57,7 +57,7 @@ class TestCcxTools(unittest.TestCase):
         self.mesh_name = "Mesh"
         self.test_file_dir = join(
             testtools.get_fem_test_home_dir(),
-            "ccx"
+            "calculix"
         )
 
     # ********************************************************************************************
@@ -87,7 +87,7 @@ class TestCcxTools(unittest.TestCase):
         # set up
         from femexamples.boxanalysis_frequency import setup
         setup(self.document, "ccxtools")
-        base_name = get_namefromdef("test_box", "cube")
+        base_name = get_namefromdef("test_")
         res_obj_name = "CCX_Mode1_Results"
         analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
 
@@ -115,7 +115,7 @@ class TestCcxTools(unittest.TestCase):
         # set up
         from femexamples.boxanalysis_static import setup
         setup(self.document, "ccxtools")
-        base_name = get_namefromdef("test_box", "cube")
+        base_name = get_namefromdef("test_")
         res_obj_name = "CCX_Results"
         analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
 
@@ -142,7 +142,7 @@ class TestCcxTools(unittest.TestCase):
     ):
         from femexamples.ccx_cantilever_hexa20faceload import setup
         setup(self.document, "ccxtools")
-        self.input_file_writing_test(None, get_namefromdef("test_ccxcantilever", "canti_ccx_faceload"))
+        self.input_file_writing_test(None, get_namefromdef("test_"))
 
     # ********************************************************************************************
     def test_constraint_contact_shell_shell(
@@ -188,7 +188,7 @@ class TestCcxTools(unittest.TestCase):
     ):
         from femexamples.material_multiple_twoboxes import setup
         setup(self.document, "ccxtools")
-        self.input_file_writing_test(None, get_namefromdef("test_material", "mat"))
+        self.input_file_writing_test(None, get_namefromdef("test_"))
 
     # ********************************************************************************************
     def test_material_nonlinear(
@@ -196,7 +196,7 @@ class TestCcxTools(unittest.TestCase):
     ):
         from femexamples.material_nl_platewithhole import setup
         setup(self.document, "ccxtools")
-        self.input_file_writing_test(None, get_namefromdef("test_material", "mat"))
+        self.input_file_writing_test(None, get_namefromdef("test_"))
 
     # ********************************************************************************************
     def test_thermomech_bimetall(
@@ -213,7 +213,7 @@ class TestCcxTools(unittest.TestCase):
         # set up
         from femexamples.thermomech_flow1d import setup
         setup(self.document, "ccxtools")
-        base_name = get_namefromdef("test_thermomech_flow1D", "Flow1D_thermomech")
+        base_name = get_namefromdef("test_")
         res_obj_name = "CCX_Time1_0_Results"
         analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
 
@@ -241,7 +241,7 @@ class TestCcxTools(unittest.TestCase):
         # set up
         from femexamples.thermomech_spine import setup
         setup(self.document, "ccxtools")
-        base_name = get_namefromdef("test_thermomech_spine", "spine_thermomech")
+        base_name = get_namefromdef("test_")
         res_obj_name = "CCX_Results"
         analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
 

src/Mod/Fem/femtest/app/test_result.py

@@ -72,8 +72,8 @@ class TestResult(unittest.TestCase):
         # read data from frd file
         frd_file = join(
             testtools.get_fem_test_home_dir(),
-            "ccx",
-            "Flow1D_thermomech.frd"
+            "calculix",
+            "thermomech_flow1D.frd"
         )
         from feminout.importCcxFrdResults import read_frd_result as read_frd
         frd_content = read_frd(frd_file)

src/Mod/Fem/femtest/app/test_solver_calculix.py

@@ -76,7 +76,7 @@ class TestSolverCalculix(unittest.TestCase):
     ):
         from femexamples.boxanalysis_static import setup
         setup(self.document, "calculix")
-        self.calculix_inputfile_writing_test("cube_static")
+        self.calculix_inputfile_writing_test("box_static")
 
     # ********************************************************************************************
     def calculix_inputfile_writing_test(
@@ -111,7 +111,7 @@ class TestSolverCalculix(unittest.TestCase):
         # compare input file with the given one
         inpfile_given = join(
             testtools.get_fem_test_home_dir(),
-            "ccx",
+            "calculix",
             (base_name + ".inp")
         )
         inpfile_totest = join(