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

FEM: unit tests, adapte 1DFlow example and extend stats comparing to mflow and networkpressure in conjunction with inout nodes file

Browse Source
This commit is contained in:
Bernd Hahnebach
2017-07-21 06:22:16 +01:00
parent 71a283f8fa
commit cdb48197b9
5 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Fem/App/CMakeLists.txt
View File

@@ -195,6 +195,7 @@ SET(FemTests_SRCS
test_files/ccx/Flow1D_thermomech.dat
test_files/ccx/Flow1D_thermomech.frd
test_files/ccx/Flow1D_thermomech_expected_values
test_files/ccx/Flow1D_thermomech_inout_nodes.txt
test_files/ccx/Flow1D_thermomech.fcstd
)

1
src/Mod/Fem/CMakeLists.txt
View File

@@ -159,6 +159,7 @@ INSTALL(
test_files/ccx/Flow1D_thermomech.dat
test_files/ccx/Flow1D_thermomech.frd
test_files/ccx/Flow1D_thermomech_expected_values
test_files/ccx/Flow1D_thermomech_inout_nodes.txt
test_files/ccx/Flow1D_thermomech.fcstd
DESTINATION
Mod/Fem/test_files/ccx

20
src/Mod/Fem/TestFem.py
View File

@@ -739,7 +739,8 @@ 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, ["U1", "U2", "U3", "Uabs", "Sabs"]) # TODO use all result stats
# ret = compare_stats(fea, Flow1D_thermomech_expected_values, ["U1", "U2", "U3", "Uabs", "Sabs"]) # leave it as an example how to use not all stats
ret = compare_stats(fea, Flow1D_thermomech_expected_values)
self.assertFalse(ret, "Invalid results read from .frd file")
fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(Flow1D_thermomech_save_fc_file))
@@ -905,6 +906,23 @@ def create_test_results():
shutil.copyfile(dat_result_file, dat_thermomech_test_result_file)
print('Results copied to the appropriate FEM test dirs in: ' + temp_dir)
# Flow1D
# during unit test we have been read unit test frd data into the file, we gone export the stats of this results
# they may not fit 100 % with the results we get with this file, TODO use the results we will get by a recalculation
FreeCAD.open(Flow1D_thermomech_save_fc_file)
FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis)
fea = FemToolsCcx.FemToolsCcx()
stats_flow1D = [] # be carefule if we have more than one result object !
for s in stat_types:
statval = fea.get_stats(s)
stats_flow1D.append("{0}: ({1:.14g}, {2:.14g}, {3:.14g})\n".format(s, statval[0], statval[1], statval[2]))
Flow1D_thermomech_expected_values_file = Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech_expected_values'
f = open(Flow1D_thermomech_expected_values_file, 'w')
for s in stats_flow1D:
f.write(s)
f.close()
print('Expected stats file copied to the appropriate FEM test dirs in: ' + temp_dir)
'''
update the results of FEM unit tests:

8
src/Mod/Fem/test_files/ccx/Flow1D_thermomech_expected_values
View File

@@ -3,3 +3,11 @@ U2: (0, 0, 0)
U3: (0, 0, 0)
Uabs: (0, 0, 0)
Sabs: (0, 0, 0)
MaxPrin: (0, 0, 0)
MidPrin: (0, 0, 0)
MinPrin: (0, 0, 0)
MaxShear: (0, 0, 0)
Peeq: (0, 0, 0)
Temp: (0, 0, 0)
MFlow: (78.3805, 78.3805, 78.3805)
NPress: (0.1, 0.14299225925926, 0.191652)

2
src/Mod/Fem/test_files/ccx/Flow1D_thermomech_inout_nodes.txt Normal file
View File

@@ -0,0 +1,2 @@
2,15,1,PIPE INLET
13,27,28,PIPE OUTLET