From 629a89218d72d035fde6161eb6247b4bc0f0651d Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Sat, 14 Nov 2015 13:15:09 +0000 Subject: [PATCH] FEM: Fix Von Mises calculation formula and update FEM test results Reported-by: fandaL Fixed-by: fandaL Signed-off-by: Przemo Firszt --- src/Mod/Fem/ccxFrdReader.py | 2 +- src/Mod/Fem/test_files/ccx/cube_frequency_expected_values | 2 +- src/Mod/Fem/test_files/ccx/cube_static_expected_values | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/ccxFrdReader.py index 77626b36e..0fb0dbf17 100644 --- a/src/Mod/Fem/ccxFrdReader.py +++ b/src/Mod/Fem/ccxFrdReader.py @@ -143,7 +143,7 @@ def calculate_von_mises(i): s11s22 = pow(s11 - s22, 2) s22s33 = pow(s22 - s33, 2) s33s11 = pow(s33 - s11, 2) - s12s23s31 = 6 * (pow(s12, 2) + pow(s23, 2) * pow(s31, 2)) + s12s23s31 = 6 * (pow(s12, 2) + pow(s23, 2) + pow(s31, 2)) vm_stress = sqrt(0.5 * (s11s22 + s22s33 + s33s11 + s12s23s31)) return vm_stress diff --git a/src/Mod/Fem/test_files/ccx/cube_frequency_expected_values b/src/Mod/Fem/test_files/ccx/cube_frequency_expected_values index 68d3d8300..878912a9a 100644 --- a/src/Mod/Fem/test_files/ccx/cube_frequency_expected_values +++ b/src/Mod/Fem/test_files/ccx/cube_frequency_expected_values @@ -2,4 +2,4 @@ U1: (-597.498, 84.82195996428565, 901.838) U2: (-273.839, -1.5082389321428573, 238.951) U3: (-1184.18, 1.7762851928571448, 1160.54) Uabs: (0.0, 332.74282887147507, 1483.9997229490982) -Sabs: (32.0603981499924, 16769157.377068823, 175748402.99829367) +Sabs: (34.568504654320115, 156.2643878650541, 632.7104221160478) diff --git a/src/Mod/Fem/test_files/ccx/cube_static_expected_values b/src/Mod/Fem/test_files/ccx/cube_static_expected_values index 5549fe21c..ecbfb62de 100644 --- a/src/Mod/Fem/test_files/ccx/cube_static_expected_values +++ b/src/Mod/Fem/test_files/ccx/cube_static_expected_values @@ -2,4 +2,4 @@ U1: (0.0, 0.00024985193821428577, 0.000516572) U2: (-6.94117e-08, -1.4674202846428578e-09, 5.848e-08) U3: (-3.29906e-05, -1.3824489785714289e-05, 0.0) Uabs: (0.0, 0.000250245499688639, 0.0005176145328950496) -Sabs: (9.282590510518093, 10.000064926271618, 10.717700043318548) +Sabs: (9.283923634521724, 10.001504511041594, 10.718814164456221)