From 6d9775fb5ea9372a276cd46f4e3228b403c6dfa9 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 7 Feb 2018 13:32:50 +0100 Subject: [PATCH] FEM: unit tests, improve imports and dir definitions --- src/Mod/Fem/femtest/testccxtools.py | 148 +++++++++------------ src/Mod/Fem/femtest/testcommon.py | 84 +++--------- src/Mod/Fem/femtest/testsolverframework.py | 79 +++-------- src/Mod/Fem/femtest/testtools.py | 47 ++----- 4 files changed, 118 insertions(+), 240 deletions(-) diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index 16482d4bde..176534fbc2 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -1,8 +1,7 @@ -# Unit test for the FEM module - # *************************************************************************** # * Copyright (c) 2015 - FreeCAD Developers * # * Author: Przemo Firszt * +# * Author: Bernd Hahnebach * # * * # * This file is part of the FreeCAD CAx development system. * # * * @@ -28,52 +27,9 @@ import Fem from femtools import ccxtools import FreeCAD import ObjectsFem -import tempfile import unittest -import os +from . import testtools from .testtools import fcc_print -from .testtools import compare_inp_files -from .testtools import compare_stats - - -mesh_name = 'Mesh' -stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"] - -home_path = FreeCAD.getHomePath() -temp_dir = tempfile.gettempdir() + '/FEM_unittests/' -if not os.path.exists(temp_dir): - os.makedirs(temp_dir) -test_file_dir = home_path + 'Mod/Fem/femtest/testfiles/ccx/' -test_file_dir_elmer = home_path + 'Mod/Fem/femtest/testfiles/elmer/' - -# define some locations fot the analysis tests -# since they are also used in the helper def which create results they should stay global for the module -static_base_name = 'cube_static' -static_analysis_dir = temp_dir + 'FEM_ccx_static/' -static_save_fc_file = static_analysis_dir + static_base_name + '.fcstd' -static_analysis_inp_file = test_file_dir + static_base_name + '.inp' -static_expected_values = test_file_dir + "cube_static_expected_values" - -frequency_base_name = 'cube_frequency' -frequency_analysis_dir = temp_dir + 'FEM_ccx_frequency/' -frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.fcstd' -frequency_analysis_inp_file = test_file_dir + frequency_base_name + '.inp' -frequency_expected_values = test_file_dir + "cube_frequency_expected_values" - -thermomech_base_name = 'spine_thermomech' -thermomech_analysis_dir = temp_dir + 'FEM_ccx_thermomech/' -thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.fcstd' -thermomech_analysis_inp_file = test_file_dir + thermomech_base_name + '.inp' -thermomech_expected_values = test_file_dir + "spine_thermomech_expected_values" - -Flow1D_thermomech_base_name = 'Flow1D_thermomech' -Flow1D_thermomech_analysis_dir = temp_dir + 'FEM_ccx_Flow1D_thermomech/' -Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.fcstd' -Flow1D_thermomech_analysis_inp_file = test_file_dir + Flow1D_thermomech_base_name + '.inp' -Flow1D_thermomech_expected_values = test_file_dir + "Flow1D_thermomech_expected_values" - -solverframework_analysis_dir = temp_dir + 'FEM_solverframework/' -solverframework_save_fc_file = solverframework_analysis_dir + static_base_name + '.fcstd' class FemCcxAnalysisTest(unittest.TestCase): @@ -86,6 +42,9 @@ class FemCcxAnalysisTest(unittest.TestCase): finally: FreeCAD.setActiveDocument("FemTest") self.active_doc = FreeCAD.ActiveDocument + self.mesh_name = 'Mesh' + self.temp_dir = testtools.get_fem_test_tmp_dir() + self.test_file_dir = testtools.get_fem_test_home_dir() + 'ccx/' def test_static_freq_analysis(self): # static @@ -152,14 +111,17 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(ret, "Import of mesh nodes failed") ret = create_elements_cube(mesh) self.assertTrue(ret, "Import of mesh volumes failed") - mesh_object = self.active_doc.addObject('Fem::FemMeshObject', mesh_name) + mesh_object = self.active_doc.addObject('Fem::FemMeshObject', self.mesh_name) mesh_object.FemMesh = mesh self.assertTrue(mesh, "FemTest of new mesh failed") analysis.addObject(mesh_object) self.active_doc.recompute() + static_base_name = 'cube_static' + static_analysis_dir = testtools.get_unit_test_tmp_dir(self.temp_dir, 'FEM_ccx_static/') fea = ccxtools.FemToolsCcx(analysis, solver_object, test_mode=True) + fcc_print('Setting up working directory {}'.format(static_analysis_dir)) fea.setup_working_dir(static_analysis_dir) self.assertTrue(True if fea.working_dir == static_analysis_dir else False, @@ -170,19 +132,19 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertFalse(error, "ccxtools check_prerequisites returned error message: {}".format(error)) fcc_print('Checking FEM inp file write...') - - fcc_print('Writing {}/{}.inp for static analysis'.format(static_analysis_dir, mesh_name)) + fcc_print('Writing {}/{}.inp for static analysis'.format(static_analysis_dir, self.mesh_name)) error = fea.write_inp_file() self.assertFalse(error, "Writing failed") - fcc_print('Comparing {} to {}/{}.inp'.format(static_analysis_inp_file, static_analysis_dir, mesh_name)) - ret = compare_inp_files(static_analysis_inp_file, static_analysis_dir + mesh_name + '.inp') + static_analysis_inp_file = self.test_file_dir + static_base_name + '.inp' + fcc_print('Comparing {} to {}/{}.inp'.format(static_analysis_inp_file, static_analysis_dir, self.mesh_name)) + ret = testtools.compare_inp_files(static_analysis_inp_file, static_analysis_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) - fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(test_file_dir)) - fea.setup_working_dir(test_file_dir) - self.assertTrue(True if fea.working_dir == test_file_dir else False, - "Setting working directory {} failed".format(test_file_dir)) + fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) + fea.setup_working_dir(self.test_file_dir) + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, + "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('cube_static')) fea.set_base_name(static_base_name) @@ -199,13 +161,17 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(fea.results_present, "Cannot read results from {}.frd frd file".format(fea.base_name)) fcc_print('Reading stats from result object for static analysis...') - ret = compare_stats(fea, static_expected_values, 'CalculiX_static_results') + static_expected_values = self.test_file_dir + "cube_static_expected_values" + 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' fcc_print('Save FreeCAD file for static analysis to {}...'.format(static_save_fc_file)) self.active_doc.saveAs(static_save_fc_file) # frequency + frequency_base_name = 'cube_frequency' + frequency_analysis_dir = self.temp_dir + 'FEM_ccx_frequency/' fcc_print('Reset Statik analysis') fea.reset_all() fcc_print('Setting analysis type to \'frequency\"') @@ -220,18 +186,19 @@ class FemCcxAnalysisTest(unittest.TestCase): error = fea.check_prerequisites() self.assertFalse(error, "ccxtools check_prerequisites returned error message: {}".format(error)) - fcc_print('Writing {}/{}.inp for frequency analysis'.format(frequency_analysis_dir, mesh_name)) + fcc_print('Writing {}/{}.inp for frequency analysis'.format(frequency_analysis_dir, self.mesh_name)) error = fea.write_inp_file() self.assertFalse(error, "Writing failed") - fcc_print('Comparing {} to {}/{}.inp'.format(frequency_analysis_inp_file, frequency_analysis_dir, mesh_name)) - ret = compare_inp_files(frequency_analysis_inp_file, frequency_analysis_dir + mesh_name + '.inp') + frequency_analysis_inp_file = self.test_file_dir + frequency_base_name + '.inp' + fcc_print('Comparing {} to {}/{}.inp'.format(frequency_analysis_inp_file, frequency_analysis_dir, self.mesh_name)) + ret = testtools.compare_inp_files(frequency_analysis_inp_file, frequency_analysis_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) - fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(test_file_dir)) - fea.setup_working_dir(test_file_dir) - self.assertTrue(True if fea.working_dir == test_file_dir else False, - "Setting working directory {} failed".format(test_file_dir)) + fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) + fea.setup_working_dir(self.test_file_dir) + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, + "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format(frequency_base_name)) fea.set_base_name(frequency_base_name) @@ -248,9 +215,11 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(fea.results_present, "Cannot read results from {}.frd frd file".format(fea.base_name)) fcc_print('Reading stats from result object for frequency analysis...') - ret = compare_stats(fea, frequency_expected_values, 'CalculiX_frequency_mode_1_results') + frequency_expected_values = self.test_file_dir + "cube_frequency_expected_values" + 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' 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 static and frequency analysis ---------------') @@ -325,14 +294,17 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(ret, "Import of mesh nodes failed") ret = create_elements_spine(mesh) self.assertTrue(ret, "Import of mesh volumes failed") - mesh_object = self.active_doc.addObject('Fem::FemMeshObject', mesh_name) + mesh_object = self.active_doc.addObject('Fem::FemMeshObject', self.mesh_name) mesh_object.FemMesh = mesh self.assertTrue(mesh, "FemTest of new mesh failed") analysis.addObject(mesh_object) self.active_doc.recompute() + thermomech_base_name = 'spine_thermomech' + thermomech_analysis_dir = self.temp_dir + 'FEM_ccx_thermomech/' fea = ccxtools.FemToolsCcx(analysis, test_mode=True) + fcc_print('Setting up working directory {}'.format(thermomech_analysis_dir)) fea.setup_working_dir(thermomech_analysis_dir) self.assertTrue(True if fea.working_dir == thermomech_analysis_dir else False, @@ -343,19 +315,19 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertFalse(error, "ccxtools check_prerequisites returned error message: {}".format(error)) fcc_print('Checking FEM inp file write...') - - fcc_print('Writing {}/{}.inp for thermomech analysis'.format(thermomech_analysis_dir, mesh_name)) + fcc_print('Writing {}/{}.inp for thermomech analysis'.format(thermomech_analysis_dir, self.mesh_name)) error = fea.write_inp_file() self.assertFalse(error, "Writing failed") - fcc_print('Comparing {} to {}/{}.inp'.format(thermomech_analysis_inp_file, thermomech_analysis_dir, mesh_name)) - ret = compare_inp_files(thermomech_analysis_inp_file, thermomech_analysis_dir + mesh_name + '.inp') + thermomech_analysis_inp_file = self.test_file_dir + thermomech_base_name + '.inp' + fcc_print('Comparing {} to {}/{}.inp'.format(thermomech_analysis_inp_file, thermomech_analysis_dir, self.mesh_name)) + ret = testtools.compare_inp_files(thermomech_analysis_inp_file, thermomech_analysis_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) - fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(test_file_dir)) - fea.setup_working_dir(test_file_dir) - self.assertTrue(True if fea.working_dir == test_file_dir else False, - "Setting working directory {} failed".format(test_file_dir)) + fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) + fea.setup_working_dir(self.test_file_dir) + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, + "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('spine_thermomech')) fea.set_base_name(thermomech_base_name) @@ -372,9 +344,11 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(fea.results_present, "Cannot read results from {}.frd frd file".format(fea.base_name)) fcc_print('Reading stats from result object for thermomech analysis...') - ret = compare_stats(fea, thermomech_expected_values, 'CalculiX_thermomech_results') + thermomech_expected_values = self.test_file_dir + "spine_thermomech_expected_values" + 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' fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(thermomech_save_fc_file)) self.active_doc.saveAs(thermomech_save_fc_file) @@ -569,14 +543,17 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(ret, "Import of mesh nodes failed") ret = create_elements_Flow1D(mesh) self.assertTrue(ret, "Import of mesh volumes failed") - mesh_object = self.active_doc.addObject('Fem::FemMeshObject', mesh_name) + mesh_object = self.active_doc.addObject('Fem::FemMeshObject', self.mesh_name) mesh_object.FemMesh = mesh self.assertTrue(mesh, "FemTest of new mesh failed") analysis.addObject(mesh_object) self.active_doc.recompute() + Flow1D_thermomech_base_name = 'Flow1D_thermomech' + Flow1D_thermomech_analysis_dir = self.temp_dir + 'FEM_ccx_Flow1D_thermomech/' fea = ccxtools.FemToolsCcx(analysis, test_mode=True) + fcc_print('Setting up working directory {}'.format(Flow1D_thermomech_analysis_dir)) fea.setup_working_dir(Flow1D_thermomech_analysis_dir) self.assertTrue(True if fea.working_dir == Flow1D_thermomech_analysis_dir else False, @@ -587,19 +564,19 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertFalse(error, "ccxtools check_prerequisites returned error message: {}".format(error)) fcc_print('Checking FEM inp file write...') - - fcc_print('Writing {}/{}.inp for thermomech analysis'.format(Flow1D_thermomech_analysis_dir, mesh_name)) + fcc_print('Writing {}/{}.inp for thermomech analysis'.format(Flow1D_thermomech_analysis_dir, self.mesh_name)) error = fea.write_inp_file() self.assertFalse(error, "Writing failed") - fcc_print('Comparing {} to {}/{}.inp'.format(Flow1D_thermomech_analysis_inp_file, Flow1D_thermomech_analysis_dir, mesh_name)) - ret = compare_inp_files(Flow1D_thermomech_analysis_inp_file, Flow1D_thermomech_analysis_dir + mesh_name + '.inp') + Flow1D_thermomech_analysis_inp_file = self.test_file_dir + Flow1D_thermomech_base_name + '.inp' + fcc_print('Comparing {} to {}/{}.inp'.format(Flow1D_thermomech_analysis_inp_file, Flow1D_thermomech_analysis_dir, self.mesh_name)) + ret = testtools.compare_inp_files(Flow1D_thermomech_analysis_inp_file, Flow1D_thermomech_analysis_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) - fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(test_file_dir)) - fea.setup_working_dir(test_file_dir) - self.assertTrue(True if fea.working_dir == test_file_dir else False, - "Setting working directory {} failed".format(test_file_dir)) + fcc_print('Setting up working directory to {} in order to read simulated calculations'.format(self.test_file_dir)) + fea.setup_working_dir(self.test_file_dir) + self.assertTrue(True if fea.working_dir == self.test_file_dir else False, + "Setting working directory {} failed".format(self.test_file_dir)) fcc_print('Setting base name to read test {}.frd file...'.format('Flow1D_thermomech')) fea.set_base_name(Flow1D_thermomech_base_name) @@ -616,9 +593,12 @@ class FemCcxAnalysisTest(unittest.TestCase): self.assertTrue(fea.results_present, "Cannot read results from {}.frd frd file".format(fea.base_name)) fcc_print('Reading stats from result object for Flow1D thermomech analysis...') - ret = compare_stats(fea, Flow1D_thermomech_expected_values, stat_types, 'CalculiX_thermomech_time_1_0_results') + Flow1D_thermomech_expected_values = self.test_file_dir + "Flow1D_thermomech_expected_values" + stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"] + 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' fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(Flow1D_thermomech_save_fc_file)) self.active_doc.saveAs(Flow1D_thermomech_save_fc_file) diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py index 0a639f8632..6c55a60ca0 100644 --- a/src/Mod/Fem/femtest/testcommon.py +++ b/src/Mod/Fem/femtest/testcommon.py @@ -1,8 +1,6 @@ -# Unit test for the FEM module - # *************************************************************************** # * Copyright (c) 2015 - FreeCAD Developers * -# * Author: Przemo Firszt * +# * Author: Bernd Hahnebach * # * * # * This file is part of the FreeCAD CAx development system. * # * * @@ -27,55 +25,13 @@ import Fem import FreeCAD import ObjectsFem -import tempfile import unittest -import os +from . import testtools from .testtools import fcc_print -from .testtools import get_defmake_count -from .testtools import collect_python_modules - - -mesh_name = 'Mesh' -stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"] - -home_path = FreeCAD.getHomePath() -temp_dir = tempfile.gettempdir() + '/FEM_unittests/' -if not os.path.exists(temp_dir): - os.makedirs(temp_dir) -test_file_dir = home_path + 'Mod/Fem/femtest/testfiles/ccx/' -test_file_dir_elmer = home_path + 'Mod/Fem/femtest/testfiles/elmer/' - -# define some locations fot the analysis tests -# since they are also used in the helper def which create results they should stay global for the module -static_base_name = 'cube_static' -static_analysis_dir = temp_dir + 'FEM_ccx_static/' -static_save_fc_file = static_analysis_dir + static_base_name + '.fcstd' -static_analysis_inp_file = test_file_dir + static_base_name + '.inp' -static_expected_values = test_file_dir + "cube_static_expected_values" - -frequency_base_name = 'cube_frequency' -frequency_analysis_dir = temp_dir + 'FEM_ccx_frequency/' -frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.fcstd' -frequency_analysis_inp_file = test_file_dir + frequency_base_name + '.inp' -frequency_expected_values = test_file_dir + "cube_frequency_expected_values" - -thermomech_base_name = 'spine_thermomech' -thermomech_analysis_dir = temp_dir + 'FEM_ccx_thermomech/' -thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.fcstd' -thermomech_analysis_inp_file = test_file_dir + thermomech_base_name + '.inp' -thermomech_expected_values = test_file_dir + "spine_thermomech_expected_values" - -Flow1D_thermomech_base_name = 'Flow1D_thermomech' -Flow1D_thermomech_analysis_dir = temp_dir + 'FEM_ccx_Flow1D_thermomech/' -Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.fcstd' -Flow1D_thermomech_analysis_inp_file = test_file_dir + Flow1D_thermomech_base_name + '.inp' -Flow1D_thermomech_expected_values = test_file_dir + "Flow1D_thermomech_expected_values" - -solverframework_analysis_dir = temp_dir + 'FEM_solverframework/' -solverframework_save_fc_file = solverframework_analysis_dir + static_base_name + '.fcstd' class FemTest(unittest.TestCase): + def setUp(self): try: FreeCAD.setActiveDocument("FemTest") @@ -133,7 +89,7 @@ class FemTest(unittest.TestCase): tetra10.addNode(9, 3, 9, 10) tetra10.addVolume([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) - unv_file = temp_dir + '/tetra10_mesh.unv' + unv_file = testtools.get_fem_test_tmp_dir() + '/tetra10_mesh.unv' tetra10.write(unv_file) newmesh = Fem.read(unv_file) expected = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10) @@ -149,7 +105,7 @@ class FemTest(unittest.TestCase): seg2.addNode(-5000000000000000000.1, -1.123456789123456e-14, -0.1234567890123456789e-101, 2) seg2.addEdge([1, 2]) - inp_file = temp_dir + '/seg2_mesh.inp' + inp_file = testtools.get_fem_test_tmp_dir() + '/seg2_mesh.inp' seg2.writeABAQUS(inp_file, 1, False) read_file = open(inp_file, 'r') @@ -169,7 +125,7 @@ class FemTest(unittest.TestCase): def test_read_frd_massflow_networkpressure(self): # read data from frd file - frd_file = test_file_dir + 'Flow1D_thermomech.frd' + frd_file = testtools.get_fem_test_home_dir() + 'ccx/Flow1D_thermomech.frd' import feminout.importCcxFrdResults as importCcxFrdResults frd_content = importCcxFrdResults.readResult(frd_file) @@ -402,7 +358,7 @@ class FemTest(unittest.TestCase): # TODO the equations show up twice on Tree (on solver and on analysis), if they are added to the analysis group doc.recompute() - self.assertEqual(len(analysis.Group), get_defmake_count() - 1) # because of the analysis itself count -1 + self.assertEqual(len(analysis.Group), testtools.get_defmake_count() - 1) # because of the analysis itself count -1 def test_femobjects_type(self): doc = self.active_doc @@ -629,20 +585,20 @@ class FemTest(unittest.TestCase): pymodules = [] # collect all Python modules in Fem - pymodules += collect_python_modules('') # Fem main dir - pymodules += collect_python_modules('feminout') - pymodules += collect_python_modules('femmesh') - pymodules += collect_python_modules('femresult') - pymodules += collect_python_modules('femtest') - pymodules += collect_python_modules('femobjects') + pymodules += testtools.collect_python_modules('') # Fem main dir + pymodules += testtools.collect_python_modules('feminout') + pymodules += testtools.collect_python_modules('femmesh') + pymodules += testtools.collect_python_modules('femresult') + pymodules += testtools.collect_python_modules('femtest') + pymodules += testtools.collect_python_modules('femobjects') if FreeCAD.GuiUp: - pymodules += collect_python_modules('femcommands') - pymodules += collect_python_modules('femguiobjects') - pymodules += collect_python_modules('femsolver') - pymodules += collect_python_modules('femsolver/elmer') - pymodules += collect_python_modules('femsolver/elmer/equations') - pymodules += collect_python_modules('femsolver/z88') - pymodules += collect_python_modules('femsolver/calculix') + pymodules += testtools.collect_python_modules('femcommands') + pymodules += testtools.collect_python_modules('femguiobjects') + pymodules += testtools.collect_python_modules('femsolver') + pymodules += testtools.collect_python_modules('femsolver/elmer') + pymodules += testtools.collect_python_modules('femsolver/elmer/equations') + pymodules += testtools.collect_python_modules('femsolver/z88') + pymodules += testtools.collect_python_modules('femsolver/calculix') # import all collected modules # fcc_print(pymodules) diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py index 0844dd8428..62e1504690 100644 --- a/src/Mod/Fem/femtest/testsolverframework.py +++ b/src/Mod/Fem/femtest/testsolverframework.py @@ -1,8 +1,6 @@ -# Unit test for the FEM module - # *************************************************************************** # * Copyright (c) 2015 - FreeCAD Developers * -# * Author: Przemo Firszt * +# * Copyright (c) 2018 - Bernd Hahnebach * # * * # * This file is part of the FreeCAD CAx development system. * # * * @@ -28,51 +26,9 @@ import Fem import FreeCAD import ObjectsFem import femsolver.run -import tempfile import unittest -import os +from . import testtools from .testtools import fcc_print -from .testtools import compare_inp_files - - -mesh_name = 'Mesh' -stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"] - -home_path = FreeCAD.getHomePath() -temp_dir = tempfile.gettempdir() + '/FEM_unittests/' -if not os.path.exists(temp_dir): - os.makedirs(temp_dir) -test_file_dir = home_path + 'Mod/Fem/femtest/testfiles/ccx/' -test_file_dir_elmer = home_path + 'Mod/Fem/femtest/testfiles/elmer/' - -# define some locations fot the analysis tests -# since they are also used in the helper def which create results they should stay global for the module -static_base_name = 'cube_static' -static_analysis_dir = temp_dir + 'FEM_ccx_static/' -static_save_fc_file = static_analysis_dir + static_base_name + '.fcstd' -static_analysis_inp_file = test_file_dir + static_base_name + '.inp' -static_expected_values = test_file_dir + "cube_static_expected_values" - -frequency_base_name = 'cube_frequency' -frequency_analysis_dir = temp_dir + 'FEM_ccx_frequency/' -frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.fcstd' -frequency_analysis_inp_file = test_file_dir + frequency_base_name + '.inp' -frequency_expected_values = test_file_dir + "cube_frequency_expected_values" - -thermomech_base_name = 'spine_thermomech' -thermomech_analysis_dir = temp_dir + 'FEM_ccx_thermomech/' -thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.fcstd' -thermomech_analysis_inp_file = test_file_dir + thermomech_base_name + '.inp' -thermomech_expected_values = test_file_dir + "spine_thermomech_expected_values" - -Flow1D_thermomech_base_name = 'Flow1D_thermomech' -Flow1D_thermomech_analysis_dir = temp_dir + 'FEM_ccx_Flow1D_thermomech/' -Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.fcstd' -Flow1D_thermomech_analysis_inp_file = test_file_dir + Flow1D_thermomech_base_name + '.inp' -Flow1D_thermomech_expected_values = test_file_dir + "Flow1D_thermomech_expected_values" - -solverframework_analysis_dir = temp_dir + 'FEM_solverframework/' -solverframework_save_fc_file = solverframework_analysis_dir + static_base_name + '.fcstd' class SolverFrameWorkTest(unittest.TestCase): @@ -85,6 +41,9 @@ class SolverFrameWorkTest(unittest.TestCase): finally: FreeCAD.setActiveDocument("FemTest") self.active_doc = FreeCAD.ActiveDocument + self.mesh_name = 'Mesh' + self.temp_dir = testtools.get_fem_test_tmp_dir() + self.test_file_dir = testtools.get_fem_test_home_dir() + 'ccx/' def test_solver_framework(self): fcc_print('--------------- Start of FEM tests solver frame work ---------------') @@ -137,7 +96,7 @@ class SolverFrameWorkTest(unittest.TestCase): self.assertTrue(ret, "Import of mesh nodes failed") ret = create_elements_cube(mesh) self.assertTrue(ret, "Import of mesh volumes failed") - mesh_object = self.active_doc.addObject('Fem::FemMeshObject', mesh_name) + mesh_object = self.active_doc.addObject('Fem::FemMeshObject', self.mesh_name) mesh_object.FemMesh = mesh self.assertTrue(mesh, "FemTest of new mesh failed") analysis.addObject(mesh_object) @@ -145,7 +104,7 @@ class SolverFrameWorkTest(unittest.TestCase): self.active_doc.recompute() # solver frame work ccx solver - fcc_print('Checking FEM solver for solver frame work...') + fcc_print('Checking FEM CalculiX solver for solver frame work...') solver_ccx2_object = ObjectsFem.makeSolverCalculix(self.active_doc, 'SolverCalculiX') solver_ccx2_object.AnalysisType = 'static' solver_ccx2_object.GeometricalNonlinearity = 'linear' @@ -158,18 +117,18 @@ class SolverFrameWorkTest(unittest.TestCase): self.assertTrue(solver_ccx2_object, "FemTest of new ccx solver failed") analysis.addObject(solver_ccx2_object) - fcc_print('Checking inpfile writing for solverframework_save_fc_file frame work...') - if not os.path.exists(solverframework_analysis_dir): # solver frameworkd does explicit not create a non existing directory - os.makedirs(solverframework_analysis_dir) - + static_base_name = 'cube_static' + solverframework_analysis_dir = testtools.get_unit_test_tmp_dir(testtools.get_fem_test_tmp_dir(), 'FEM_solverframework/') + fcc_print('Checking FEM Elmer solver for solver frame work......') fcc_print('machine_ccx') machine_ccx = solver_ccx2_object.Proxy.createMachine(solver_ccx2_object, solverframework_analysis_dir) fcc_print('Machine testmode: ' + str(machine_ccx.testmode)) machine_ccx.target = femsolver.run.PREPARE machine_ccx.start() machine_ccx.join() # wait for the machine to finish. - fcc_print('Comparing {} to {}/{}.inp'.format(static_analysis_inp_file, solverframework_analysis_dir, mesh_name)) - ret = compare_inp_files(static_analysis_inp_file, solverframework_analysis_dir + mesh_name + '.inp') + static_analysis_inp_file = testtools.get_fem_test_home_dir() + 'ccx/' + static_base_name + '.inp' + fcc_print('Comparing {} to {}/{}.inp'.format(static_analysis_inp_file, solverframework_analysis_dir, self.mesh_name)) + ret = testtools.compare_inp_files(static_analysis_inp_file, solverframework_analysis_dir + self.mesh_name + '.inp') self.assertFalse(ret, "ccxtools write_inp_file test failed.\n{}".format(ret)) # use solver frame work elmer solver @@ -199,24 +158,26 @@ class SolverFrameWorkTest(unittest.TestCase): machine_elmer.join() # wait for the machine to finish. ''' + test_file_dir_elmer = testtools.get_fem_test_home_dir() + 'elmer/' fcc_print('Test writing STARTINFO file') fcc_print('Comparing {} to {}'.format(test_file_dir_elmer + 'ELMERSOLVER_STARTINFO', solverframework_analysis_dir + 'ELMERSOLVER_STARTINFO')) - ret = compare_files(test_file_dir_elmer + 'ELMERSOLVER_STARTINFO', solverframework_analysis_dir + 'ELMERSOLVER_STARTINFO') + ret = testtools.compare_files(test_file_dir_elmer + 'ELMERSOLVER_STARTINFO', solverframework_analysis_dir + 'ELMERSOLVER_STARTINFO') self.assertFalse(ret, "STARTINFO write file test failed.\n{}".format(ret)) fcc_print('Test writing case file') fcc_print('Comparing {} to {}'.format(test_file_dir_elmer + 'case.sif', solverframework_analysis_dir + 'case.sif')) - ret = compare_files(test_file_dir_elmer + 'case.sif', solverframework_analysis_dir + 'case.sif') + ret = testtools.compare_files(test_file_dir_elmer + 'case.sif', solverframework_analysis_dir + 'case.sif') self.assertFalse(ret, "case write file test failed.\n{}".format(ret)) fcc_print('Test writing GMSH geo file') fcc_print('Comparing {} to {}'.format(test_file_dir_elmer + 'group_mesh.geo', solverframework_analysis_dir + 'group_mesh.geo')) - ret = compare_files(test_file_dir_elmer + 'group_mesh.geo', solverframework_analysis_dir + 'group_mesh.geo') + 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)) ''' - fcc_print('Save FreeCAD file for static2 analysis to {}...'.format(solverframework_save_fc_file)) - self.active_doc.saveAs(solverframework_save_fc_file) + 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 ---------------') def tearDown(self): diff --git a/src/Mod/Fem/femtest/testtools.py b/src/Mod/Fem/femtest/testtools.py index 6fc7c85d7f..f4de4c055a 100644 --- a/src/Mod/Fem/femtest/testtools.py +++ b/src/Mod/Fem/femtest/testtools.py @@ -1,6 +1,6 @@ # *************************************************************************** # * Copyright (c) 2018 - FreeCAD Developers * -# * Copyright (c) 2018 - Bernd Hahnebach * +# * Author: Bernd Hahnebach * # * * # * This file is part of the FreeCAD CAx development system. * # * * @@ -34,41 +34,22 @@ import tempfile import os -mesh_name = 'Mesh' -stat_types = ["U1", "U2", "U3", "Uabs", "Sabs", "MaxPrin", "MidPrin", "MinPrin", "MaxShear", "Peeq", "Temp", "MFlow", "NPress"] +def get_fem_test_home_dir(): + return FreeCAD.getHomePath() + 'Mod/Fem/femtest/testfiles/' # getHomePath() returns path with backslash -home_path = FreeCAD.getHomePath() -temp_dir = tempfile.gettempdir() + '/FEM_unittests/' -if not os.path.exists(temp_dir): - os.makedirs(temp_dir) -test_file_dir = home_path + 'Mod/Fem/femtest/testfiles/ccx/' -test_file_dir_elmer = home_path + 'Mod/Fem/femtest/testfiles/elmer/' -# define some locations fot the analysis tests -# since they are also used in the helper def which create results they should stay global for the module -static_base_name = 'cube_static' -static_analysis_dir = temp_dir + 'FEM_ccx_static/' -static_save_fc_file = static_analysis_dir + static_base_name + '.fcstd' -static_analysis_inp_file = test_file_dir + static_base_name + '.inp' -static_expected_values = test_file_dir + "cube_static_expected_values" +def get_fem_test_tmp_dir(): + temp_dir = tempfile.gettempdir() + '/FEM_unittests/' # gettempdir() returns path without backslash + if not os.path.exists(temp_dir): + os.makedirs(temp_dir) + return(temp_dir) -frequency_base_name = 'cube_frequency' -frequency_analysis_dir = temp_dir + 'FEM_ccx_frequency/' -frequency_save_fc_file = frequency_analysis_dir + frequency_base_name + '.fcstd' -frequency_analysis_inp_file = test_file_dir + frequency_base_name + '.inp' -frequency_expected_values = test_file_dir + "cube_frequency_expected_values" -thermomech_base_name = 'spine_thermomech' -thermomech_analysis_dir = temp_dir + 'FEM_ccx_thermomech/' -thermomech_save_fc_file = thermomech_analysis_dir + thermomech_base_name + '.fcstd' -thermomech_analysis_inp_file = test_file_dir + thermomech_base_name + '.inp' -thermomech_expected_values = test_file_dir + "spine_thermomech_expected_values" - -Flow1D_thermomech_base_name = 'Flow1D_thermomech' -Flow1D_thermomech_analysis_dir = temp_dir + 'FEM_ccx_Flow1D_thermomech/' -Flow1D_thermomech_save_fc_file = Flow1D_thermomech_analysis_dir + Flow1D_thermomech_base_name + '.fcstd' -Flow1D_thermomech_analysis_inp_file = test_file_dir + Flow1D_thermomech_base_name + '.inp' -Flow1D_thermomech_expected_values = test_file_dir + "Flow1D_thermomech_expected_values" +def get_unit_test_tmp_dir(temp_dir, unittestdir): + testdir = temp_dir + unittestdir + if not os.path.exists(testdir): + os.makedirs(testdir) + return testdir def fcc_print(message): @@ -81,7 +62,7 @@ def get_defmake_count(): could also be done in bash with grep -c "def make" src/Mod/Fem/ObjectsFem.py ''' - name_modfile = home_path + 'Mod/Fem/ObjectsFem.py' + name_modfile = FreeCAD.getHomePath() + 'Mod/Fem/ObjectsFem.py' modfile = open(name_modfile, 'r') lines_modefile = modfile.readlines() modfile.close()