From 1e32082ee13e4c04de88a4b26a94871adad9256d Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 17 Jan 2019 07:55:09 +0100 Subject: [PATCH] FEM: test suite, use FCStd instead of fcstd, as it is what FreeCAD does on saveing a file --- src/Mod/Fem/CMakeLists.txt | 8 +++++--- src/Mod/Fem/femtest/testccxtools.py | 18 +++++++++--------- ...ermomech.fcstd => Flow1D_thermomech.FCStd} | Bin .../testfiles/ccx/{cube.fcstd => cube.FCStd} | Bin ...e_frequency.fcstd => cube_frequency.FCStd} | Bin .../{cube_static.fcstd => cube_static.FCStd} | Bin ...hermomech.fcstd => spine_thermomech.FCStd} | Bin src/Mod/Fem/femtest/testsolverframework.py | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) rename src/Mod/Fem/femtest/testfiles/ccx/{Flow1D_thermomech.fcstd => Flow1D_thermomech.FCStd} (100%) rename src/Mod/Fem/femtest/testfiles/ccx/{cube.fcstd => cube.FCStd} (100%) rename src/Mod/Fem/femtest/testfiles/ccx/{cube_frequency.fcstd => cube_frequency.FCStd} (100%) rename src/Mod/Fem/femtest/testfiles/ccx/{cube_static.fcstd => cube_static.FCStd} (100%) rename src/Mod/Fem/femtest/testfiles/ccx/{spine_thermomech.fcstd => spine_thermomech.FCStd} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 21433f91e6..d34ba5d4ef 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -135,11 +135,13 @@ SET(FemTestsCcx_SRCS femtest/testfiles/ccx/cube_frequency.dat femtest/testfiles/ccx/cube_frequency.frd femtest/testfiles/ccx/cube_frequency_expected_values + femtest/testfiles/ccx/cube_frequency.FCStd femtest/testfiles/ccx/cube_static.inp femtest/testfiles/ccx/cube_static.dat femtest/testfiles/ccx/cube_static.frd femtest/testfiles/ccx/cube_static_expected_values - femtest/testfiles/ccx/cube.fcstd + femtest/testfiles/ccx/cube_static.FCStd + femtest/testfiles/ccx/cube.FCStd femtest/testfiles/ccx/multimat.inp femtest/testfiles/ccx/multimat_mesh.py femtest/testfiles/ccx/spine_mesh.py @@ -147,14 +149,14 @@ SET(FemTestsCcx_SRCS femtest/testfiles/ccx/spine_thermomech.dat femtest/testfiles/ccx/spine_thermomech.frd femtest/testfiles/ccx/spine_thermomech_expected_values - femtest/testfiles/ccx/spine_thermomech.fcstd + femtest/testfiles/ccx/spine_thermomech.FCStd femtest/testfiles/ccx/Flow1D_mesh.py femtest/testfiles/ccx/Flow1D_thermomech.inp femtest/testfiles/ccx/Flow1D_thermomech.dat femtest/testfiles/ccx/Flow1D_thermomech.frd femtest/testfiles/ccx/Flow1D_thermomech_expected_values femtest/testfiles/ccx/Flow1D_thermomech_inout_nodes.txt - femtest/testfiles/ccx/Flow1D_thermomech.fcstd + femtest/testfiles/ccx/Flow1D_thermomech.FCStd ) SET(FemTestsElmer_SRCS diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index 7c11d7bb8d..a6b5dc0c7f 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -166,7 +166,7 @@ class TestCcxTools(unittest.TestCase): ret = testtools.compare_stats(fea, static_expected_values, 'CalculiX_static_results') self.assertFalse(ret, "Invalid results read from .frd file") - static_save_fc_file = static_analysis_dir + static_base_name + '.fcstd' + static_save_fc_file = static_analysis_dir + static_base_name + '.FCStd' fcc_print('Save FreeCAD file for static analysis to {}...'.format(static_save_fc_file)) self.active_doc.saveAs(static_save_fc_file) fcc_print('--------------- End of FEM tests static and analysis ---------------') @@ -273,7 +273,7 @@ class TestCcxTools(unittest.TestCase): ret = testtools.compare_inp_files(static_analysis_inp_file, static_multiplemat_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) - static_save_fc_file = static_multiplemat_dir + static_base_name + '.fcstd' + static_save_fc_file = static_multiplemat_dir + static_base_name + '.FCStd' fcc_print('Save FreeCAD file for static analysis to {}...'.format(static_save_fc_file)) self.active_doc.saveAs(static_save_fc_file) fcc_print('--------------- End of FEM ccxtools multiple material test ---------------') @@ -371,7 +371,7 @@ class TestCcxTools(unittest.TestCase): ret = testtools.compare_stats(fea, frequency_expected_values, 'CalculiX_frequency_mode_1_results') self.assertFalse(ret, "Invalid results read from .frd file") - frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.fcstd' + frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.FCStd' fcc_print('Save FreeCAD file for frequency analysis to {}...'.format(frequency_save_fc_file)) self.active_doc.saveAs(frequency_save_fc_file) fcc_print('--------------- End of FEM tests frequency analysis ---------------') @@ -500,7 +500,7 @@ class TestCcxTools(unittest.TestCase): ret = testtools.compare_stats(fea, thermomech_expected_values, 'CalculiX_thermomech_results') self.assertFalse(ret, "Invalid results read from .frd file") - thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.fcstd' + thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.FCStd' fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(thermomech_save_fc_file)) self.active_doc.saveAs(thermomech_save_fc_file) @@ -750,7 +750,7 @@ class TestCcxTools(unittest.TestCase): ret = testtools.compare_stats(fea, Flow1D_thermomech_expected_values, stat_types, 'CalculiX_thermomech_time_1_0_results') self.assertFalse(ret, "Invalid results read from .frd file") - Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.fcstd' + Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.FCStd' fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(Flow1D_thermomech_save_fc_file)) self.active_doc.saveAs(Flow1D_thermomech_save_fc_file) @@ -783,7 +783,7 @@ def create_test_results(): Test.runTestsFromModule(current_module) # static cube - FreeCAD.open(static_analysis_dir + 'cube_static.fcstd') + FreeCAD.open(static_analysis_dir + 'cube_static.FCStd') FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) fea = ccxtools.FemToolsCcx() @@ -808,7 +808,7 @@ def create_test_results(): shutil.copyfile(dat_result_file, dat_static_test_result_file) # frequency cube - FreeCAD.open(frequency_analysis_dir + 'cube_frequency.fcstd') + FreeCAD.open(frequency_analysis_dir + 'cube_frequency.FCStd') FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) fea = ccxtools.FemToolsCcx() @@ -833,7 +833,7 @@ def create_test_results(): # thermomech print("create thermomech result files") - FreeCAD.open(thermomech_analysis_dir + 'spine_thermomech.fcstd') + FreeCAD.open(thermomech_analysis_dir + 'spine_thermomech.FCStd') FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) fea = ccxtools.FemToolsCcx() fea.reset_all() @@ -858,7 +858,7 @@ def create_test_results(): # Flow1D print("create Flow1D result files") - FreeCAD.open(Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech.fcstd') + FreeCAD.open(Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech.FCStd') FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) fea = ccxtools.FemToolsCcx() fea.reset_all() diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.fcstd b/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.fcstd rename to src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube.fcstd b/src/Mod/Fem/femtest/testfiles/ccx/cube.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube.fcstd rename to src/Mod/Fem/femtest/testfiles/ccx/cube.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.fcstd b/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.fcstd rename to src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.fcstd b/src/Mod/Fem/femtest/testfiles/ccx/cube_static.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static.fcstd rename to src/Mod/Fem/femtest/testfiles/ccx/cube_static.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.fcstd b/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.fcstd rename to src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.FCStd diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py index 2ca2048921..923fdbcf86 100644 --- a/src/Mod/Fem/femtest/testsolverframework.py +++ b/src/Mod/Fem/femtest/testsolverframework.py @@ -176,7 +176,7 @@ class TestSolverFrameWork(unittest.TestCase): ret = testtools.compare_files(test_file_dir_elmer + 'group_mesh.geo', solverframework_analysis_dir + 'group_mesh.geo') self.assertFalse(ret, "GMSH geo write file test failed.\n{}".format(ret)) - save_fc_file = solverframework_analysis_dir + static_base_name + '.fcstd' + save_fc_file = solverframework_analysis_dir + static_base_name + '.FCStd' fcc_print('Save FreeCAD file for static2 analysis to {}...'.format(save_fc_file)) self.active_doc.saveAs(save_fc_file) fcc_print('--------------- End of FEM tests solver frame work ---------------')