FEM: move CalculiX test files to test_files/ccx directory

src/Mod/Fem/App/CMakeLists.txt

@@ -113,18 +113,18 @@ SET(FemScripts_SRCS
 #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
 
 SET(FemTests_SRCS
-    test_files/mesh_points.csv
+    test_files/ccx/mesh_points.csv
-    test_files/mesh_volumes.csv
+    test_files/ccx/mesh_volumes.csv
-    test_files/static_analysis.inp
+    test_files/ccx/static_analysis.inp
-    test_files/frequency_analysis.inp
+    test_files/ccx/frequency_analysis.inp
-    test_files/cube_frequency.inp
+    test_files/ccx/cube_frequency.inp
-    test_files/cube_frequency.dat
+    test_files/ccx/cube_frequency.dat
-    test_files/cube_frequency.frd
+    test_files/ccx/cube_frequency.frd
-    test_files/cube_frequency_expected_values
+    test_files/ccx/cube_frequency_expected_values
-    test_files/cube_static.inp
+    test_files/ccx/cube_static.inp
-    test_files/cube_static.dat
+    test_files/ccx/cube_static.dat
-    test_files/cube_static.frd
+    test_files/ccx/cube_static.frd
-    test_files/cube_static_expected_values
+    test_files/ccx/cube_static_expected_values
 )
 
 SET(FemBase_SRCS

src/Mod/Fem/CMakeLists.txt

@@ -59,18 +59,19 @@ INSTALL(
 
 INSTALL(
     FILES
-        test_files/mesh_points.csv
+        # changes on the file list here needs to be made in App/CMakeLists.txt as well
-        test_files/mesh_volumes.csv
+        test_files/ccx/mesh_points.csv
-        test_files/static_analysis.inp
+        test_files/ccx/mesh_volumes.csv
-        test_files/frequency_analysis.inp
+        test_files/ccx/static_analysis.inp
-        test_files/cube_frequency.inp
+        test_files/ccx/frequency_analysis.inp
-        test_files/cube_frequency.dat
+        test_files/ccx/cube_frequency.inp
-        test_files/cube_frequency.frd
+        test_files/ccx/cube_frequency.dat
-        test_files/cube_frequency_expected_values
+        test_files/ccx/cube_frequency.frd
-        test_files/cube_static.inp
+        test_files/ccx/cube_frequency_expected_values
-        test_files/cube_static.dat
+        test_files/ccx/cube_static.inp
-        test_files/cube_static.frd
+        test_files/ccx/cube_static.dat
-        test_files/cube_static_expected_values
+        test_files/ccx/cube_static.frd
+        test_files/ccx/cube_static_expected_values
     DESTINATION
-        Mod/Fem/test_files
+        Mod/Fem/test_files/ccx
 )

src/Mod/Fem/TestFem.py

@@ -37,7 +37,7 @@ mesh_name = 'Mesh'
 
 home_path = FreeCAD.getHomePath()
 temp_dir = tempfile.gettempdir()
-test_file_dir = home_path + 'Mod/Fem/test_files'
+test_file_dir = home_path + 'Mod/Fem/test_files/ccx'
 
 static_base_name = 'cube_static'
 frequency_base_name = 'cube_frequency'