diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index 24ed683dfc..8a11171331 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -905,8 +905,7 @@ 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"]) # leave it as an example how to use not all stats - ret = compare_stats(fea, Flow1D_thermomech_expected_values) + ret = compare_stats(fea, Flow1D_thermomech_expected_values, stat_types, 'CalculiX_thermomech_time_1_0_results') self.assertFalse(ret, "Invalid results read from .frd file") fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(Flow1D_thermomech_save_fc_file)) @@ -948,7 +947,7 @@ def compare_inp_files(file_name1, file_name2): return result -def compare_stats(fea, stat_file=None, loc_stat_types=None): +def compare_stats(fea, stat_file=None, loc_stat_types=None, res_obj_name=None): if not loc_stat_types: loc_stat_types = stat_types if stat_file: @@ -962,7 +961,10 @@ def compare_stats(fea, stat_file=None, loc_stat_types=None): sf_content = force_unix_line_ends(sf_content) stats = [] for s in loc_stat_types: - statval = fea.get_stats(s) + if res_obj_name: + statval = fea.get_stats(s, res_obj_name) + else: + statval = fea.get_stats(s) stats.append("{0}: ({1:.14g}, {2:.14g}, {3:.14g})\n".format(s, statval[0], statval[1], statval[2])) if sf_content != stats: fcc_print("Expected stats from {}".format(stat_file)) @@ -1073,22 +1075,29 @@ def create_test_results(): 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() + fea.reset_all() + fea.run() + fea.load_results() stats_flow1D = [] # be carefule if we have more than one result object ! for s in stat_types: - statval = fea.get_stats(s) + statval = fea.get_stats(s, 'CalculiX_thermomech_time_1_0_results') 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) + # could be added in FemToolsCcx to the self object as an Attribut + frd_result_file = os.path.splitext(fea.inp_file_name)[0] + '.frd' + dat_result_file = os.path.splitext(fea.inp_file_name)[0] + '.dat' + frd_Flow1D_thermomech_test_result_file = Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech.frd' + dat_Flow1D_thermomech_test_result_file = Flow1D_thermomech_analysis_dir + 'Flow1D_thermomech.dat' + shutil.copyfile(frd_result_file, frd_Flow1D_thermomech_test_result_file) + shutil.copyfile(dat_result_file, dat_Flow1D_thermomech_test_result_file) + print('Flow1D thermomech results copied to the appropriate FEM test dirs in: ' + temp_dir) ''' update the results of FEM unit tests: diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.frd b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.frd index a4de2731b1..5e20d7d0b3 100644 --- a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.frd +++ b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech.frd @@ -1,38 +1,40 @@ 1C 1UUSER - 1UDATE 09.june.2017 - 1UTIME 11:49:27 + 1UDATE 20.july.2017 + 1UTIME 08:30:06 1UHOST 1UPGM CalculiX + 1UVERSION Version 2.11 + 1UCOMPILETIME So 31. Jul 13:26:31 CEST 2016 1UDIR 1UDBN 1UMAT 1FLUIDMATERIAL 2C 25 1 - -1 2 0.00000E+00-1.11022E-14-5.00000E+01 - -1 3 0.00000E+00-9.54792E-13-4.30000E+03 - -1 4 4.95000E+03-9.54792E-13-4.30000E+03 - -1 5 5.00000E+03-9.54792E-13-4.30000E+03 - -1 6 8.53553E+03-1.73984E-12-7.83553E+03 - -1 7 8.56988E+03-1.74769E-12-7.87088E+03 - -1 8 1.21054E+04-2.53273E-12-1.14064E+04 - -1 9 1.21408E+04-2.54058E-12-1.14418E+04 - -1 10 1.39085E+04-2.93310E-12-1.32095E+04 - -1 11 1.39439E+04-2.94095E-12-1.32449E+04 - -1 12 1.50470E+04-3.18589E-12-1.43480E+04 - -1 13 1.50470E+04-1.76480E-12-7.94797E+03 + -1 2 0.00000E+00 0.00000E+00-5.00000E+01 + -1 3 0.00000E+00 0.00000E+00-4.30000E+03 + -1 4 4.95000E+03 0.00000E+00-4.30000E+03 + -1 5 5.00000E+03 0.00000E+00-4.30000E+03 + -1 6 8.53553E+03 0.00000E+00-7.83553E+03 + -1 7 8.56988E+03 0.00000E+00-7.87088E+03 + -1 8 1.21054E+04 0.00000E+00-1.14064E+04 + -1 9 1.21408E+04 0.00000E+00-1.14418E+04 + -1 10 1.39085E+04 0.00000E+00-1.32095E+04 + -1 11 1.39439E+04 0.00000E+00-1.32449E+04 + -1 12 1.50470E+04 0.00000E+00-1.43480E+04 + -1 13 1.50470E+04 0.00000E+00-7.94797E+03 -1 15 0.00000E+00 0.00000E+00 0.00000E+00 - -1 16 0.00000E+00-4.82947E-13-2.17500E+03 - -1 17 2.47500E+03-9.54792E-13-4.30000E+03 - -1 18 4.97500E+03-9.54792E-13-4.30000E+03 - -1 19 6.76777E+03-1.34731E-12-6.06777E+03 - -1 20 8.55271E+03-1.74376E-12-7.85321E+03 - -1 21 1.03376E+04-2.14021E-12-9.63864E+03 - -1 22 1.21231E+04-2.53666E-12-1.14241E+04 - -1 23 1.30246E+04-2.73684E-12-1.23256E+04 - -1 24 1.39262E+04-2.93703E-12-1.32272E+04 - -1 25 1.44954E+04-3.06342E-12-1.37964E+04 - -1 26 1.50470E+04-2.47535E-12-1.11480E+04 - -1 27 1.50470E+04-1.75370E-12-7.89797E+03 + -1 16 0.00000E+00 0.00000E+00-2.17500E+03 + -1 17 2.47500E+03 0.00000E+00-4.30000E+03 + -1 18 4.97500E+03 0.00000E+00-4.30000E+03 + -1 19 6.76777E+03 0.00000E+00-6.06777E+03 + -1 20 8.55271E+03 0.00000E+00-7.85321E+03 + -1 21 1.03376E+04 0.00000E+00-9.63864E+03 + -1 22 1.21231E+04 0.00000E+00-1.14241E+04 + -1 23 1.30246E+04 0.00000E+00-1.23256E+04 + -1 24 1.39262E+04 0.00000E+00-1.32272E+04 + -1 25 1.44954E+04 0.00000E+00-1.37964E+04 + -1 26 1.50470E+04 0.00000E+00-1.11480E+04 + -1 27 1.50470E+04 0.00000E+00-7.89797E+03 -3 3C 13 1 -1 1 11 0 1 @@ -63,62 +65,782 @@ -2 13 27 -3 1PSTEP 1 1 1 - 100CL 101 1.000000000 25 0 1 1 + 100CL 101 3.90625E-03 25 0 1 1 -4 MAFLOW 1 1 -5 MF 1 1 0 0 - -1 2 7.83805E-02 - -1 3 7.83805E-02 - -1 4 7.83805E-02 - -1 5 7.83805E-02 - -1 6 7.83805E-02 - -1 7 7.83805E-02 - -1 8 7.83805E-02 - -1 9 7.83805E-02 - -1 10 7.83805E-02 - -1 11 7.83805E-02 - -1 12 7.83805E-02 - -1 13 7.83805E-02 - -1 15 7.83805E-02 - -1 16 7.83805E-02 - -1 17 7.83805E-02 - -1 18 7.83805E-02 - -1 19 7.83805E-02 - -1 20 7.83805E-02 - -1 21 7.83805E-02 - -1 22 7.83805E-02 - -1 23 7.83805E-02 - -1 24 7.83805E-02 - -1 25 7.83805E-02 - -1 26 7.83805E-02 - -1 27 7.83805E-02 + -1 2 6.94717E-03 + -1 3 6.94717E-03 + -1 4 6.94717E-03 + -1 5 6.94717E-03 + -1 6 6.94717E-03 + -1 7 6.94717E-03 + -1 8 6.94717E-03 + -1 9 6.94717E-03 + -1 10 6.94717E-03 + -1 11 6.94717E-03 + -1 12 6.94717E-03 + -1 13 6.94717E-03 + -1 15 6.94717E-03 + -1 16 6.94717E-03 + -1 17 6.94717E-03 + -1 18 6.94717E-03 + -1 19 6.94717E-03 + -1 20 6.94717E-03 + -1 21 6.94717E-03 + -1 22 6.94717E-03 + -1 23 6.94717E-03 + -1 24 6.94717E-03 + -1 25 6.94717E-03 + -1 26 6.94717E-03 + -1 27 6.94717E-03 -3 1PSTEP 2 1 1 - 100CL 101 1.000000000 25 0 1 1 + 100CL 101 3.90625E-03 25 0 1 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 3.90625E-04 + -1 3 4.99998E-04 + -1 4 4.99796E-04 + -1 5 4.97346E-04 + -1 6 6.32354E-04 + -1 7 6.45744E-04 + -1 8 7.80932E-04 + -1 9 6.79877E-04 + -1 10 7.47010E-04 + -1 11 5.93493E-04 + -1 12 6.35385E-04 + -1 13 3.90625E-04 + -1 15 3.90625E-04 + -1 16 4.45311E-04 + -1 17 4.99897E-04 + -1 18 4.98571E-04 + -1 19 5.64850E-04 + -1 20 6.39049E-04 + -1 21 7.13338E-04 + -1 22 7.30404E-04 + -1 23 7.13443E-04 + -1 24 6.70252E-04 + -1 25 6.14439E-04 + -1 26 5.13005E-04 + -1 27 3.90625E-04 + -3 + 1PSTEP 3 2 1 + 100CL 102 7.81250E-03 25 0 2 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 9.80537E-03 + -1 3 9.80537E-03 + -1 4 9.80537E-03 + -1 5 9.80537E-03 + -1 6 9.80537E-03 + -1 7 9.80537E-03 + -1 8 9.80537E-03 + -1 9 9.80537E-03 + -1 10 9.80537E-03 + -1 11 9.80537E-03 + -1 12 9.80537E-03 + -1 13 9.80537E-03 + -1 15 9.80537E-03 + -1 16 9.80537E-03 + -1 17 9.80537E-03 + -1 18 9.80537E-03 + -1 19 9.80537E-03 + -1 20 9.80537E-03 + -1 21 9.80537E-03 + -1 22 9.80537E-03 + -1 23 9.80537E-03 + -1 24 9.80537E-03 + -1 25 9.80537E-03 + -1 26 9.80537E-03 + -1 27 9.80537E-03 + -3 + 1PSTEP 4 2 1 + 100CL 102 7.81250E-03 25 0 2 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 7.81250E-04 + -1 3 1.00042E-03 + -1 4 9.99611E-04 + -1 5 9.94731E-04 + -1 6 1.26434E-03 + -1 7 1.29103E-03 + -1 8 1.56136E-03 + -1 9 1.36005E-03 + -1 10 1.49338E-03 + -1 11 1.18757E-03 + -1 12 1.27077E-03 + -1 13 7.81250E-04 + -1 15 7.81250E-04 + -1 16 8.90833E-04 + -1 17 1.00001E-03 + -1 18 9.97171E-04 + -1 19 1.12954E-03 + -1 20 1.27768E-03 + -1 21 1.42619E-03 + -1 22 1.46071E-03 + -1 23 1.42672E-03 + -1 24 1.34048E-03 + -1 25 1.22917E-03 + -1 26 1.02601E-03 + -1 27 7.81250E-04 + -3 + 1PSTEP 5 3 1 + 100CL 103 1.36719E-02 25 0 3 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 1.29331E-02 + -1 3 1.29331E-02 + -1 4 1.29331E-02 + -1 5 1.29331E-02 + -1 6 1.29331E-02 + -1 7 1.29331E-02 + -1 8 1.29331E-02 + -1 9 1.29331E-02 + -1 10 1.29331E-02 + -1 11 1.29331E-02 + -1 12 1.29331E-02 + -1 13 1.29331E-02 + -1 15 1.29331E-02 + -1 16 1.29331E-02 + -1 17 1.29331E-02 + -1 18 1.29331E-02 + -1 19 1.29331E-02 + -1 20 1.29331E-02 + -1 21 1.29331E-02 + -1 22 1.29331E-02 + -1 23 1.29331E-02 + -1 24 1.29331E-02 + -1 25 1.29331E-02 + -1 26 1.29331E-02 + -1 27 1.29331E-02 + -3 + 1PSTEP 6 3 1 + 100CL 103 1.36719E-02 25 0 3 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 1.36719E-03 + -1 3 1.75182E-03 + -1 4 1.74937E-03 + -1 5 1.74088E-03 + -1 6 2.21165E-03 + -1 7 2.25810E-03 + -1 8 2.73105E-03 + -1 9 2.38088E-03 + -1 10 2.61176E-03 + -1 11 2.07977E-03 + -1 12 2.22385E-03 + -1 13 1.36719E-03 + -1 15 1.36719E-03 + -1 16 1.55950E-03 + -1 17 1.75059E-03 + -1 18 1.74512E-03 + -1 19 1.97626E-03 + -1 20 2.23487E-03 + -1 21 2.49458E-03 + -1 22 2.55597E-03 + -1 23 2.49632E-03 + -1 24 2.34577E-03 + -1 25 2.15181E-03 + -1 26 1.79552E-03 + -1 27 1.36719E-03 + -3 + 1PSTEP 7 4 1 + 100CL 104 2.24609E-02 25 0 4 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 1.65041E-02 + -1 3 1.65041E-02 + -1 4 1.65041E-02 + -1 5 1.65041E-02 + -1 6 1.65041E-02 + -1 7 1.65041E-02 + -1 8 1.65041E-02 + -1 9 1.65041E-02 + -1 10 1.65041E-02 + -1 11 1.65041E-02 + -1 12 1.65041E-02 + -1 13 1.65041E-02 + -1 15 1.65041E-02 + -1 16 1.65041E-02 + -1 17 1.65041E-02 + -1 18 1.65041E-02 + -1 19 1.65041E-02 + -1 20 1.65041E-02 + -1 21 1.65041E-02 + -1 22 1.65041E-02 + -1 23 1.65041E-02 + -1 24 1.65041E-02 + -1 25 1.65041E-02 + -1 26 1.65041E-02 + -1 27 1.65041E-02 + -3 + 1PSTEP 8 4 1 + 100CL 104 2.24609E-02 25 0 4 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 2.24609E-03 + -1 3 2.88064E-03 + -1 4 2.87409E-03 + -1 5 2.86026E-03 + -1 6 3.63111E-03 + -1 7 3.70682E-03 + -1 8 4.48353E-03 + -1 9 3.91334E-03 + -1 10 4.28673E-03 + -1 11 3.42046E-03 + -1 12 3.65346E-03 + -1 13 2.24609E-03 + -1 15 2.24609E-03 + -1 16 2.56336E-03 + -1 17 2.87736E-03 + -1 18 2.86717E-03 + -1 19 3.24568E-03 + -1 20 3.66897E-03 + -1 21 4.09518E-03 + -1 22 4.19843E-03 + -1 23 4.10004E-03 + -1 24 3.85360E-03 + -1 25 3.53696E-03 + -1 26 2.94978E-03 + -1 27 2.24609E-03 + -3 + 1PSTEP 9 5 1 + 100CL 105 3.56445E-02 25 0 5 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 2.06558E-02 + -1 3 2.06558E-02 + -1 4 2.06558E-02 + -1 5 2.06558E-02 + -1 6 2.06558E-02 + -1 7 2.06558E-02 + -1 8 2.06558E-02 + -1 9 2.06558E-02 + -1 10 2.06558E-02 + -1 11 2.06558E-02 + -1 12 2.06558E-02 + -1 13 2.06558E-02 + -1 15 2.06558E-02 + -1 16 2.06558E-02 + -1 17 2.06558E-02 + -1 18 2.06558E-02 + -1 19 2.06558E-02 + -1 20 2.06558E-02 + -1 21 2.06558E-02 + -1 22 2.06558E-02 + -1 23 2.06558E-02 + -1 24 2.06558E-02 + -1 25 2.06558E-02 + -1 26 2.06558E-02 + -1 27 2.06558E-02 + -3 + 1PSTEP 10 5 1 + 100CL 105 3.56445E-02 25 0 5 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 3.56445E-03 + -1 3 4.57761E-03 + -1 4 4.56133E-03 + -1 5 4.53967E-03 + -1 6 5.75703E-03 + -1 7 5.87579E-03 + -1 8 7.10770E-03 + -1 9 6.21472E-03 + -1 10 6.79349E-03 + -1 11 5.43673E-03 + -1 12 5.79788E-03 + -1 13 3.56445E-03 + -1 15 3.56445E-03 + -1 16 4.07103E-03 + -1 17 4.56947E-03 + -1 18 4.55050E-03 + -1 19 5.14835E-03 + -1 20 5.81641E-03 + -1 21 6.49175E-03 + -1 22 6.66121E-03 + -1 23 6.50411E-03 + -1 24 6.11511E-03 + -1 25 5.61731E-03 + -1 26 4.68117E-03 + -1 27 3.56445E-03 + -3 + 1PSTEP 11 6 1 + 100CL 106 5.54199E-02 25 0 6 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 2.55093E-02 + -1 3 2.55093E-02 + -1 4 2.55093E-02 + -1 5 2.55093E-02 + -1 6 2.55093E-02 + -1 7 2.55093E-02 + -1 8 2.55093E-02 + -1 9 2.55093E-02 + -1 10 2.55093E-02 + -1 11 2.55093E-02 + -1 12 2.55093E-02 + -1 13 2.55093E-02 + -1 15 2.55093E-02 + -1 16 2.55093E-02 + -1 17 2.55093E-02 + -1 18 2.55093E-02 + -1 19 2.55093E-02 + -1 20 2.55093E-02 + -1 21 2.55093E-02 + -1 22 2.55093E-02 + -1 23 2.55093E-02 + -1 24 2.55093E-02 + -1 25 2.55093E-02 + -1 26 2.55093E-02 + -1 27 2.55093E-02 + -3 + 1PSTEP 12 6 1 + 100CL 106 5.54199E-02 25 0 6 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 5.54199E-03 + -1 3 7.13118E-03 + -1 4 7.09257E-03 + -1 5 7.05954E-03 + -1 6 8.93886E-03 + -1 7 9.12034E-03 + -1 8 1.10342E-02 + -1 9 9.67261E-03 + -1 10 1.05413E-02 + -1 11 8.47244E-03 + -1 12 9.01452E-03 + -1 13 5.54199E-03 + -1 15 5.54199E-03 + -1 16 6.33659E-03 + -1 17 7.11188E-03 + -1 18 7.07606E-03 + -1 19 7.99920E-03 + -1 20 9.02960E-03 + -1 21 1.00773E-02 + -1 22 1.03534E-02 + -1 23 1.01070E-02 + -1 24 9.50688E-03 + -1 25 8.74348E-03 + -1 26 7.27825E-03 + -1 27 5.54199E-03 + -3 + 1PSTEP 13 7 1 + 100CL 107 8.50830E-02 25 0 7 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 3.11648E-02 + -1 3 3.11648E-02 + -1 4 3.11648E-02 + -1 5 3.11648E-02 + -1 6 3.11648E-02 + -1 7 3.11648E-02 + -1 8 3.11648E-02 + -1 9 3.11648E-02 + -1 10 3.11648E-02 + -1 11 3.11648E-02 + -1 12 3.11648E-02 + -1 13 3.11648E-02 + -1 15 3.11648E-02 + -1 16 3.11648E-02 + -1 17 3.11648E-02 + -1 18 3.11648E-02 + -1 19 3.11648E-02 + -1 20 3.11648E-02 + -1 21 3.11648E-02 + -1 22 3.11648E-02 + -1 23 3.11648E-02 + -1 24 3.11648E-02 + -1 25 3.11648E-02 + -1 26 3.11648E-02 + -1 27 3.11648E-02 + -3 + 1PSTEP 14 7 1 + 100CL 107 8.50830E-02 25 0 7 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 8.50830E-03 + -1 3 1.09787E-02 + -1 4 1.08902E-02 + -1 5 1.08409E-02 + -1 6 1.36966E-02 + -1 7 1.39683E-02 + -1 8 1.69031E-02 + -1 9 1.48717E-02 + -1 10 1.61370E-02 + -1 11 1.30499E-02 + -1 12 1.38395E-02 + -1 13 8.50830E-03 + -1 15 8.50830E-03 + -1 16 9.74349E-03 + -1 17 1.09345E-02 + -1 18 1.08656E-02 + -1 19 1.22688E-02 + -1 20 1.38325E-02 + -1 21 1.54357E-02 + -1 22 1.58874E-02 + -1 23 1.55044E-02 + -1 24 1.45935E-02 + -1 25 1.34447E-02 + -1 26 1.11739E-02 + -1 27 8.50830E-03 + -3 + 1PSTEP 15 8 1 + 100CL 108 1.29578E-01 25 0 8 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 3.76821E-02 + -1 3 3.76821E-02 + -1 4 3.76821E-02 + -1 5 3.76821E-02 + -1 6 3.76821E-02 + -1 7 3.76821E-02 + -1 8 3.76821E-02 + -1 9 3.76821E-02 + -1 10 3.76821E-02 + -1 11 3.76821E-02 + -1 12 3.76821E-02 + -1 13 3.76821E-02 + -1 15 3.76821E-02 + -1 16 3.76821E-02 + -1 17 3.76821E-02 + -1 18 3.76821E-02 + -1 19 3.76821E-02 + -1 20 3.76821E-02 + -1 21 3.76821E-02 + -1 22 3.76821E-02 + -1 23 3.76821E-02 + -1 24 3.76821E-02 + -1 25 3.76821E-02 + -1 26 3.76821E-02 + -1 27 3.76821E-02 + -3 + 1PSTEP 16 8 1 + 100CL 108 1.29578E-01 25 0 8 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 1.29578E-02 + -1 3 1.67853E-02 + -1 4 1.65883E-02 + -1 5 1.65162E-02 + -1 6 2.08025E-02 + -1 7 2.12015E-02 + -1 8 2.56638E-02 + -1 9 2.26958E-02 + -1 10 2.44770E-02 + -1 11 1.99654E-02 + -1 12 2.10769E-02 + -1 13 1.29578E-02 + -1 15 1.29578E-02 + -1 16 1.48715E-02 + -1 17 1.66868E-02 + -1 18 1.65523E-02 + -1 19 1.86594E-02 + -1 20 2.10020E-02 + -1 21 2.34327E-02 + -1 22 2.41798E-02 + -1 23 2.35864E-02 + -1 24 2.22212E-02 + -1 25 2.05212E-02 + -1 26 1.70173E-02 + -1 27 1.29578E-02 + -3 + 1PSTEP 17 9 1 + 100CL 109 1.96320E-01 25 0 9 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 4.50493E-02 + -1 3 4.50493E-02 + -1 4 4.50493E-02 + -1 5 4.50493E-02 + -1 6 4.50493E-02 + -1 7 4.50493E-02 + -1 8 4.50493E-02 + -1 9 4.50493E-02 + -1 10 4.50493E-02 + -1 11 4.50493E-02 + -1 12 4.50493E-02 + -1 13 4.50493E-02 + -1 15 4.50493E-02 + -1 16 4.50493E-02 + -1 17 4.50493E-02 + -1 18 4.50493E-02 + -1 19 4.50493E-02 + -1 20 4.50493E-02 + -1 21 4.50493E-02 + -1 22 4.50493E-02 + -1 23 4.50493E-02 + -1 24 4.50493E-02 + -1 25 4.50493E-02 + -1 26 4.50493E-02 + -1 27 4.50493E-02 + -3 + 1PSTEP 18 9 1 + 100CL 109 1.96320E-01 25 0 9 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 1.96320E-02 + -1 3 2.55652E-02 + -1 4 2.51386E-02 + -1 5 2.50356E-02 + -1 6 3.14002E-02 + -1 7 3.19744E-02 + -1 8 3.87202E-02 + -1 9 3.44820E-02 + -1 10 3.68805E-02 + -1 11 3.04363E-02 + -1 12 3.19330E-02 + -1 13 1.96320E-02 + -1 15 1.96320E-02 + -1 16 2.25986E-02 + -1 17 2.53519E-02 + -1 18 2.50871E-02 + -1 19 2.82179E-02 + -1 20 3.16873E-02 + -1 21 3.53473E-02 + -1 22 3.66011E-02 + -1 23 3.56813E-02 + -1 24 3.36584E-02 + -1 25 3.11847E-02 + -1 26 2.57825E-02 + -1 27 1.96320E-02 + -3 + 1PSTEP 19 10 1 + 100CL 110 2.96432E-01 25 0 10 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 5.31446E-02 + -1 3 5.31446E-02 + -1 4 5.31446E-02 + -1 5 5.31446E-02 + -1 6 5.31446E-02 + -1 7 5.31446E-02 + -1 8 5.31446E-02 + -1 9 5.31446E-02 + -1 10 5.31446E-02 + -1 11 5.31446E-02 + -1 12 5.31446E-02 + -1 13 5.31446E-02 + -1 15 5.31446E-02 + -1 16 5.31446E-02 + -1 17 5.31446E-02 + -1 18 5.31446E-02 + -1 19 5.31446E-02 + -1 20 5.31446E-02 + -1 21 5.31446E-02 + -1 22 5.31446E-02 + -1 23 5.31446E-02 + -1 24 5.31446E-02 + -1 25 5.31446E-02 + -1 26 5.31446E-02 + -1 27 5.31446E-02 + -3 + 1PSTEP 20 10 1 + 100CL 110 2.96432E-01 25 0 10 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 2.96432E-02 + -1 3 3.88665E-02 + -1 4 3.79702E-02 + -1 5 3.78268E-02 + -1 6 4.71822E-02 + -1 7 4.79893E-02 + -1 8 5.81459E-02 + -1 9 5.22556E-02 + -1 10 5.52863E-02 + -1 11 4.63261E-02 + -1 12 4.82172E-02 + -1 13 2.96432E-02 + -1 15 2.96432E-02 + -1 16 3.42549E-02 + -1 17 3.84183E-02 + -1 18 3.78985E-02 + -1 19 4.25045E-02 + -1 20 4.75857E-02 + -1 21 5.30676E-02 + -1 22 5.52008E-02 + -1 23 5.37710E-02 + -1 24 5.08062E-02 + -1 25 4.72717E-02 + -1 26 3.89302E-02 + -1 27 2.96432E-02 + -3 + 1PSTEP 21 11 1 + 100CL 111 4.46602E-01 25 0 11 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 6.17072E-02 + -1 3 6.17072E-02 + -1 4 6.17072E-02 + -1 5 6.17072E-02 + -1 6 6.17072E-02 + -1 7 6.17072E-02 + -1 8 6.17072E-02 + -1 9 6.17072E-02 + -1 10 6.17072E-02 + -1 11 6.17072E-02 + -1 12 6.17072E-02 + -1 13 6.17072E-02 + -1 15 6.17072E-02 + -1 16 6.17072E-02 + -1 17 6.17072E-02 + -1 18 6.17072E-02 + -1 19 6.17072E-02 + -1 20 6.17072E-02 + -1 21 6.17072E-02 + -1 22 6.17072E-02 + -1 23 6.17072E-02 + -1 24 6.17072E-02 + -1 25 6.17072E-02 + -1 26 6.17072E-02 + -1 27 6.17072E-02 + -3 + 1PSTEP 22 11 1 + 100CL 111 4.46602E-01 25 0 11 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 4.46602E-02 + -1 3 5.90485E-02 + -1 4 5.72280E-02 + -1 5 5.70347E-02 + -1 6 7.06545E-02 + -1 7 7.17589E-02 + -1 8 8.70061E-02 + -1 9 7.90811E-02 + -1 10 8.25456E-02 + -1 11 7.04817E-02 + -1 12 7.26436E-02 + -1 13 4.46602E-02 + -1 15 4.46602E-02 + -1 16 5.18544E-02 + -1 17 5.81383E-02 + -1 18 5.71314E-02 + -1 19 6.38446E-02 + -1 20 7.12067E-02 + -1 21 7.93825E-02 + -1 22 8.30436E-02 + -1 23 8.08134E-02 + -1 24 7.65137E-02 + -1 25 7.15626E-02 + -1 26 5.86519E-02 + -1 27 4.46602E-02 + -3 + 1PSTEP 23 12 1 + 100CL 112 6.71856E-01 25 0 12 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 7.03423E-02 + -1 3 7.03423E-02 + -1 4 7.03423E-02 + -1 5 7.03423E-02 + -1 6 7.03423E-02 + -1 7 7.03423E-02 + -1 8 7.03423E-02 + -1 9 7.03423E-02 + -1 10 7.03423E-02 + -1 11 7.03423E-02 + -1 12 7.03423E-02 + -1 13 7.03423E-02 + -1 15 7.03423E-02 + -1 16 7.03423E-02 + -1 17 7.03423E-02 + -1 18 7.03423E-02 + -1 19 7.03423E-02 + -1 20 7.03423E-02 + -1 21 7.03423E-02 + -1 22 7.03423E-02 + -1 23 7.03423E-02 + -1 24 7.03423E-02 + -1 25 7.03423E-02 + -1 26 7.03423E-02 + -1 27 7.03423E-02 + -3 + 1PSTEP 24 12 1 + 100CL 112 6.71856E-01 25 0 12 1 + -4 STPRES 1 1 + -5 PS 1 1 0 0 + -1 2 6.71856E-02 + -1 3 8.96906E-02 + -1 4 8.61317E-02 + -1 5 8.58805E-02 + -1 6 1.05541E-01 + -1 7 1.07008E-01 + -1 8 1.29850E-01 + -1 9 1.19584E-01 + -1 10 1.22875E-01 + -1 11 1.07230E-01 + -1 12 1.09283E-01 + -1 13 6.71856E-02 + -1 15 6.71856E-02 + -1 16 7.84381E-02 + -1 17 8.79111E-02 + -1 18 8.60061E-02 + -1 19 9.57109E-02 + -1 20 1.06275E-01 + -1 21 1.18429E-01 + -1 22 1.24717E-01 + -1 23 1.21229E-01 + -1 24 1.15052E-01 + -1 25 1.08256E-01 + -1 26 8.82343E-02 + -1 27 6.71856E-02 + -3 + 1PSTEP 25 13 1 + 100CL 113 1.000000000 25 0 13 1 + -4 MAFLOW 1 1 + -5 MF 1 1 0 0 + -1 2 7.83918E-02 + -1 3 7.83918E-02 + -1 4 7.83918E-02 + -1 5 7.83918E-02 + -1 6 7.83918E-02 + -1 7 7.83918E-02 + -1 8 7.83918E-02 + -1 9 7.83918E-02 + -1 10 7.83918E-02 + -1 11 7.83918E-02 + -1 12 7.83918E-02 + -1 13 7.83918E-02 + -1 15 7.83918E-02 + -1 16 7.83918E-02 + -1 17 7.83918E-02 + -1 18 7.83918E-02 + -1 19 7.83918E-02 + -1 20 7.83918E-02 + -1 21 7.83918E-02 + -1 22 7.83918E-02 + -1 23 7.83918E-02 + -1 24 7.83918E-02 + -1 25 7.83918E-02 + -1 26 7.83918E-02 + -1 27 7.83918E-02 + -3 + 1PSTEP 26 13 1 + 100CL 113 1.000000000 25 0 13 1 -4 STPRES 1 1 -5 PS 1 1 0 0 -1 2 1.00000E-01 - -1 3 1.34842E-01 - -1 4 1.28265E-01 - -1 5 1.27953E-01 - -1 6 1.55924E-01 - -1 7 1.57802E-01 - -1 8 1.91652E-01 - -1 9 1.78963E-01 - -1 10 1.80863E-01 - -1 11 1.61473E-01 + -1 3 1.34840E-01 + -1 4 1.28261E-01 + -1 5 1.27949E-01 + -1 6 1.55918E-01 + -1 7 1.57797E-01 + -1 8 1.91647E-01 + -1 9 1.78953E-01 + -1 10 1.80849E-01 + -1 11 1.61476E-01 -1 12 1.62658E-01 -1 13 1.00000E-01 -1 15 1.00000E-01 - -1 16 1.17421E-01 - -1 17 1.31553E-01 - -1 18 1.28109E-01 - -1 19 1.41939E-01 - -1 20 1.56863E-01 - -1 21 1.74727E-01 - -1 22 1.85308E-01 - -1 23 1.79913E-01 - -1 24 1.71168E-01 - -1 25 1.62066E-01 + -1 16 1.17420E-01 + -1 17 1.31551E-01 + -1 18 1.28105E-01 + -1 19 1.41934E-01 + -1 20 1.56857E-01 + -1 21 1.74722E-01 + -1 22 1.85300E-01 + -1 23 1.79901E-01 + -1 24 1.71162E-01 + -1 25 1.62067E-01 -1 26 1.31329E-01 -1 27 1.00000E-01 -3 diff --git a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech_expected_values b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech_expected_values index c3f7a881cd..eec33452d0 100644 --- a/src/Mod/Fem/test_files/ccx/Flow1D_thermomech_expected_values +++ b/src/Mod/Fem/test_files/ccx/Flow1D_thermomech_expected_values @@ -9,5 +9,5 @@ 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) +MFlow: (78.3918, 78.3918, 78.3918) +NPress: (0.1, 0.14298874074074, 0.191647)