From c542a88e5ef09b08285fd13279739f64ff6da05b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sat, 7 Nov 2015 17:23:31 +0100 Subject: [PATCH] FEM: move CalculiX test files to test_files/ccx directory --- src/Mod/Fem/App/CMakeLists.txt | 24 ++++++++-------- src/Mod/Fem/CMakeLists.txt | 27 +++++++++--------- src/Mod/Fem/TestFem.py | 2 +- src/Mod/Fem/test_files/{ => ccx}/cube.fcstd | Bin .../test_files/{ => ccx}/cube_frequency.dat | 0 .../test_files/{ => ccx}/cube_frequency.frd | 0 .../test_files/{ => ccx}/cube_frequency.inp | 0 .../{ => ccx}/cube_frequency_expected_values | 0 .../Fem/test_files/{ => ccx}/cube_static.dat | 0 .../Fem/test_files/{ => ccx}/cube_static.frd | 0 .../Fem/test_files/{ => ccx}/cube_static.inp | 0 .../{ => ccx}/cube_static_expected_values | 0 .../{ => ccx}/frequency_analysis.inp | 0 .../Fem/test_files/{ => ccx}/mesh_points.csv | 0 .../Fem/test_files/{ => ccx}/mesh_volumes.csv | 0 .../test_files/{ => ccx}/static_analysis.inp | 0 16 files changed, 27 insertions(+), 26 deletions(-) rename src/Mod/Fem/test_files/{ => ccx}/cube.fcstd (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_frequency.dat (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_frequency.frd (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_frequency.inp (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_frequency_expected_values (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_static.dat (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_static.frd (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_static.inp (100%) rename src/Mod/Fem/test_files/{ => ccx}/cube_static_expected_values (100%) rename src/Mod/Fem/test_files/{ => ccx}/frequency_analysis.inp (100%) rename src/Mod/Fem/test_files/{ => ccx}/mesh_points.csv (100%) rename src/Mod/Fem/test_files/{ => ccx}/mesh_volumes.csv (100%) rename src/Mod/Fem/test_files/{ => ccx}/static_analysis.inp (100%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index fdc79b251..322c3c0be 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/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/mesh_volumes.csv - test_files/static_analysis.inp - test_files/frequency_analysis.inp - test_files/cube_frequency.inp - test_files/cube_frequency.dat - test_files/cube_frequency.frd - test_files/cube_frequency_expected_values - test_files/cube_static.inp - test_files/cube_static.dat - test_files/cube_static.frd - test_files/cube_static_expected_values + test_files/ccx/mesh_points.csv + test_files/ccx/mesh_volumes.csv + test_files/ccx/static_analysis.inp + test_files/ccx/frequency_analysis.inp + test_files/ccx/cube_frequency.inp + test_files/ccx/cube_frequency.dat + test_files/ccx/cube_frequency.frd + test_files/ccx/cube_frequency_expected_values + test_files/ccx/cube_static.inp + test_files/ccx/cube_static.dat + test_files/ccx/cube_static.frd + test_files/ccx/cube_static_expected_values ) SET(FemBase_SRCS diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index a6e264c6c..9000fe7f7 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -59,18 +59,19 @@ INSTALL( INSTALL( FILES - test_files/mesh_points.csv - test_files/mesh_volumes.csv - test_files/static_analysis.inp - test_files/frequency_analysis.inp - test_files/cube_frequency.inp - test_files/cube_frequency.dat - test_files/cube_frequency.frd - test_files/cube_frequency_expected_values - test_files/cube_static.inp - test_files/cube_static.dat - test_files/cube_static.frd - test_files/cube_static_expected_values + # changes on the file list here needs to be made in App/CMakeLists.txt as well + test_files/ccx/mesh_points.csv + test_files/ccx/mesh_volumes.csv + test_files/ccx/static_analysis.inp + test_files/ccx/frequency_analysis.inp + test_files/ccx/cube_frequency.inp + test_files/ccx/cube_frequency.dat + test_files/ccx/cube_frequency.frd + test_files/ccx/cube_frequency_expected_values + test_files/ccx/cube_static.inp + test_files/ccx/cube_static.dat + test_files/ccx/cube_static.frd + test_files/ccx/cube_static_expected_values DESTINATION - Mod/Fem/test_files + Mod/Fem/test_files/ccx ) diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index d81364402..586caadee 100644 --- a/src/Mod/Fem/TestFem.py +++ b/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' diff --git a/src/Mod/Fem/test_files/cube.fcstd b/src/Mod/Fem/test_files/ccx/cube.fcstd similarity index 100% rename from src/Mod/Fem/test_files/cube.fcstd rename to src/Mod/Fem/test_files/ccx/cube.fcstd diff --git a/src/Mod/Fem/test_files/cube_frequency.dat b/src/Mod/Fem/test_files/ccx/cube_frequency.dat similarity index 100% rename from src/Mod/Fem/test_files/cube_frequency.dat rename to src/Mod/Fem/test_files/ccx/cube_frequency.dat diff --git a/src/Mod/Fem/test_files/cube_frequency.frd b/src/Mod/Fem/test_files/ccx/cube_frequency.frd similarity index 100% rename from src/Mod/Fem/test_files/cube_frequency.frd rename to src/Mod/Fem/test_files/ccx/cube_frequency.frd diff --git a/src/Mod/Fem/test_files/cube_frequency.inp b/src/Mod/Fem/test_files/ccx/cube_frequency.inp similarity index 100% rename from src/Mod/Fem/test_files/cube_frequency.inp rename to src/Mod/Fem/test_files/ccx/cube_frequency.inp diff --git a/src/Mod/Fem/test_files/cube_frequency_expected_values b/src/Mod/Fem/test_files/ccx/cube_frequency_expected_values similarity index 100% rename from src/Mod/Fem/test_files/cube_frequency_expected_values rename to src/Mod/Fem/test_files/ccx/cube_frequency_expected_values diff --git a/src/Mod/Fem/test_files/cube_static.dat b/src/Mod/Fem/test_files/ccx/cube_static.dat similarity index 100% rename from src/Mod/Fem/test_files/cube_static.dat rename to src/Mod/Fem/test_files/ccx/cube_static.dat diff --git a/src/Mod/Fem/test_files/cube_static.frd b/src/Mod/Fem/test_files/ccx/cube_static.frd similarity index 100% rename from src/Mod/Fem/test_files/cube_static.frd rename to src/Mod/Fem/test_files/ccx/cube_static.frd diff --git a/src/Mod/Fem/test_files/cube_static.inp b/src/Mod/Fem/test_files/ccx/cube_static.inp similarity index 100% rename from src/Mod/Fem/test_files/cube_static.inp rename to src/Mod/Fem/test_files/ccx/cube_static.inp diff --git a/src/Mod/Fem/test_files/cube_static_expected_values b/src/Mod/Fem/test_files/ccx/cube_static_expected_values similarity index 100% rename from src/Mod/Fem/test_files/cube_static_expected_values rename to src/Mod/Fem/test_files/ccx/cube_static_expected_values diff --git a/src/Mod/Fem/test_files/frequency_analysis.inp b/src/Mod/Fem/test_files/ccx/frequency_analysis.inp similarity index 100% rename from src/Mod/Fem/test_files/frequency_analysis.inp rename to src/Mod/Fem/test_files/ccx/frequency_analysis.inp diff --git a/src/Mod/Fem/test_files/mesh_points.csv b/src/Mod/Fem/test_files/ccx/mesh_points.csv similarity index 100% rename from src/Mod/Fem/test_files/mesh_points.csv rename to src/Mod/Fem/test_files/ccx/mesh_points.csv diff --git a/src/Mod/Fem/test_files/mesh_volumes.csv b/src/Mod/Fem/test_files/ccx/mesh_volumes.csv similarity index 100% rename from src/Mod/Fem/test_files/mesh_volumes.csv rename to src/Mod/Fem/test_files/ccx/mesh_volumes.csv diff --git a/src/Mod/Fem/test_files/static_analysis.inp b/src/Mod/Fem/test_files/ccx/static_analysis.inp similarity index 100% rename from src/Mod/Fem/test_files/static_analysis.inp rename to src/Mod/Fem/test_files/ccx/static_analysis.inp