From 1071742de9cef43178e2573b9dbf71408d95a622 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 7 Feb 2018 13:32:20 +0100 Subject: [PATCH] FEM: unit tests, fix ccx tools result creation and recreate them --- src/Mod/Fem/femtest/testfemcommon.py | 6 +++--- src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd | 4 ++-- src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd | 4 ++-- src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd | 4 ++-- src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mod/Fem/femtest/testfemcommon.py b/src/Mod/Fem/femtest/testfemcommon.py index f3b9b0ec80..0112d59124 100644 --- a/src/Mod/Fem/femtest/testfemcommon.py +++ b/src/Mod/Fem/femtest/testfemcommon.py @@ -1530,7 +1530,7 @@ def create_test_results(): fea.load_results() stats_frequency = [] for s in stat_types: - statval = resulttools.get_stats(FreeCAD.ActiveDocument.getObject('CalculiX_static_mode_1_results'), s) # FIXME for some reason result obj name has static + statval = resulttools.get_stats(FreeCAD.ActiveDocument.getObject('CalculiX_frequency_mode_1_results'), s) stats_frequency.append("{0}: ({1:.14g}, {2:.14g}, {3:.14g})\n".format(s, statval[0], statval[1], statval[2])) frequency_expected_values_file = frequency_analysis_dir + 'cube_frequency_expected_values' f = open(frequency_expected_values_file, 'w') @@ -1594,8 +1594,8 @@ def create_test_results(): ''' update the results of FEM unit tests: -import TestFem -TestFem.create_test_results() +import femtest.testfemcommon +femtest.testfemcommon.create_test_results() copy result files from your_temp_directory/FEM_unittests/ test directories into the src directory compare the results with git difftool diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd b/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd index 5e20d7d0b3..3beb1a3e69 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd +++ b/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd @@ -1,7 +1,7 @@ 1C 1UUSER - 1UDATE 20.july.2017 - 1UTIME 08:30:06 + 1UDATE 07.february.2018 + 1UTIME 12:53:42 1UHOST 1UPGM CalculiX 1UVERSION Version 2.11 diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd b/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd index 6bf8b6d953..a0ac73d97e 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd +++ b/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd @@ -1,7 +1,7 @@ 1C 1UUSER - 1UDATE 07.april.2017 - 1UTIME 10:36:16 + 1UDATE 07.february.2018 + 1UTIME 12:53:41 1UHOST 1UPGM CalculiX 1UVERSION Version 2.11 diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd b/src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd index 52db8062d5..d76425c97e 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd +++ b/src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd @@ -1,7 +1,7 @@ 1C 1UUSER - 1UDATE 07.april.2017 - 1UTIME 10:36:16 + 1UDATE 07.february.2018 + 1UTIME 12:53:41 1UHOST 1UPGM CalculiX 1UVERSION Version 2.11 diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd b/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd index 4ad1f709f3..e397cd8e6d 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd +++ b/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd @@ -1,7 +1,7 @@ 1C 1UUSER - 1UDATE 07.april.2017 - 1UTIME 10:36:16 + 1UDATE 07.february.2018 + 1UTIME 12:53:41 1UHOST 1UPGM CalculiX 1UVERSION Version 2.11