kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: calculix unit tests, code improvements

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-07-06 23:29:16 +02:00
parent 8875cc5b46
commit 3080c8a713
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Mod/Fem/femtest/app/test_solver_calculix.py
View File

@@ -33,6 +33,7 @@ import FreeCAD
import femsolver.run
from . import support_utils as testtools
from .support_utils import fcc_print
from .support_utils import get_namefromdef
class TestSolverCalculix(unittest.TestCase):
@@ -48,7 +49,13 @@ class TestSolverCalculix(unittest.TestCase):
self.document = FreeCAD.newDocument(self.__class__.__name__)
# more inits
self.mesh_name = "Mesh"
self.pre_dir_name = "solver_calculix_"
self.ending = ".inp"
self.infilename = "Mesh"
self.test_file_dir = join(
testtools.get_fem_test_home_dir(),
"calculix"
)
# ********************************************************************************************
def tearDown(
@@ -64,38 +71,32 @@ class TestSolverCalculix(unittest.TestCase):
# since method name starts with 00 this will be run first
# this test just prints a line with stars
fcc_print("\n{0}\n{1} run FEM TestSolverFrameWork tests {2}\n{0}".format(
fcc_print("\n{0}\n{1} run FEM TestSolverCalculix tests {2}\n{0}".format(
100 * "*",
10 * "*",
55 * "*"
))
# ********************************************************************************************
def test_solver_calculix(
def test_box_static(
self
):
fcc_print("")
from femexamples.boxanalysis_static import setup
setup(self.document, "calculix")
self.calculix_inputfile_writing_test("box_static")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def calculix_inputfile_writing_test(
def input_file_writing_test(
self,
base_name
):
self.document.recompute()
# start
fcc_print(
"\n------------- Start of FEM CalculiX tests for {} -------"
.format(base_name)
)
# get analysis working directory and save FreeCAD file
working_dir = testtools.get_fem_test_tmp_dir("solver_calculix_" + base_name)
working_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
save_fc_file = join(working_dir, base_name + ".FCStd")
fcc_print("Save FreeCAD file to {} ...".format(save_fc_file))
# fcc_print("Save FreeCAD file to {} ...".format(save_fc_file))
self.document.saveAs(save_fc_file)
# write input file
@@ -110,18 +111,14 @@ class TestSolverCalculix(unittest.TestCase):
# compare input file with the given one
inpfile_given = join(
testtools.get_fem_test_home_dir(),
"calculix",
(base_name + ".inp")
self.test_file_dir,
base_name + self.ending
)
inpfile_totest = join(
working_dir,
self.mesh_name + ".inp"
)
fcc_print(
"Comparing {} to {}"
.format(inpfile_given, inpfile_totest)
self.infilename + self.ending
)
# fcc_print("Comparing {} to {}".format(inpfile_given, inpfile_totest))
ret = testtools.compare_inp_files(
inpfile_given,
inpfile_totest
@@ -130,9 +127,3 @@ class TestSolverCalculix(unittest.TestCase):
ret,
"CalculiX write_inp_file for {0} test failed.\n{1}".format(base_name, ret)
)
# end
fcc_print(
"--------------- End of FEM CalculiX tests for {} ---------"
.format(base_name)
)