From 87ff5881547dc19e0e167eb0c72bb8e67d492aaa Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 5 Jul 2019 22:31:33 +0200 Subject: [PATCH] FEM: unit tests, result stats, fix principal and shear stats --- .../testfiles/ccx/cube_frequency_expected_values | 8 ++++---- .../femtest/testfiles/ccx/cube_static_expected_values | 8 ++++---- .../testfiles/ccx/spine_thermomech_expected_values | 8 ++++---- src/Mod/Fem/femtest/utilstest.py | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values b/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values index f0797d3ee1..7aa855c97d 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values +++ b/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values @@ -3,10 +3,10 @@ U2: (-142.151, 204.57418299643, 551.02) U3: (-88.0403, -45.873190964286, -3.66486) Uabs: (69.406788380271, 368.26808671734, 695.63631406348) Sabs: (253.70210483837, 1550.584765187, 3661.813411182) -MaxPrin: (-0.0029467975966255, 0.017009841508179, 0.050896445645355) -MidPrin: (-0.024289766728358, 0.00050842806524365, 0.022921042483556) -MinPrin: (-0.046889619563141, -0.014481435186805, 0.0068642052938599) -MaxShear: (0.0026301991142606, 0.015745638347492, 0.036973899767846) +MaxPrin: (-171.64261808287, 920.73940817323, 2877.3028857679) +MidPrin: (-1053.2688605374, 61.84355293719, 1136.7129381108) +MinPrin: (-2584.4199852788, -815.24731273899, 288.59891042119) +MaxShear: (141.85434498876, 867.99336045611, 2036.558875184) Peeq: (0, 0, 0) Temp: (0, 0, 0) MFlow: (0, 0, 0) diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values b/src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values index 74fa93f43c..a8e1ed3498 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values +++ b/src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values @@ -3,10 +3,10 @@ U2: (-0.0109484, 1.4716768996429e-05, 0.0110702) U3: (-0.0643181, -0.030876682571429, 0) Uabs: (0, 0.039462990491044, 0.093738346040971) Sabs: (385.37990181702, 1006.7357751359, 2203.5090958167) -MaxPrin: (-445.61853474266, 75.901115035801, 908.69898140905) -MidPrin: (-2058.5234592799, -363.98683840372, 790.13062581787) -MinPrin: (-2956.2880059775, -1040.3029461492, -172.23661850878) -MaxShear: (218.05700933617, 558.10203059251, 1255.3347356174) +MaxPrin: (-924.04944196969, -23.640293171615, 1169.5484598644) +MidPrin: (-1260.1000473504, -208.29698676134, 346.87400406764) +MinPrin: (-3276.2805106799, -1096.4513895842, 3.2401143112922) +MaxShear: (218.10053031601, 536.40554820629, 1176.1155343551) Peeq: (0, 0, 0) Temp: (0, 0, 0) MFlow: (0, 0, 0) diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values b/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values index 2aa4251221..95eae1df83 100644 --- a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values +++ b/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values @@ -3,10 +3,10 @@ U2: (-0.00163382, 0.00061658895555556, 0.00222318) U3: (-0.00185329, 0.00054391362222222, 0.00220675) Uabs: (0, 0.003644782698151, 0.0073257122411351) Sabs: (0.30712297252407, 7.7474585262667, 35.861803727667) -MaxPrin: (-5.823866574601, 1.3192417907489, 10.92045561219) -MidPrin: (-37.767092580119, -4.8776425322044, 10.909826455427) -MinPrin: (-39.36716084528, -7.0235834495, 6.4737666061605) -MaxShear: (0.16818219759987, 4.1714126201244, 18.100360778484) +MaxPrin: (-5.8043388849171, 1.3112172518488, 11.117590206346) +MidPrin: (-38.557697014884, -4.9005864027774, 10.708631877287) +MinPrin: (-38.596084100199, -6.992615040027, 6.3205092526187) +MaxShear: (0.17664460289028, 4.1519161459379, 17.932302068545) Peeq: (0, 0, 0) Temp: (293.447, 299.91893333333, 310.93) MFlow: (0, 0, 0) diff --git a/src/Mod/Fem/femtest/utilstest.py b/src/Mod/Fem/femtest/utilstest.py index 57d70afd84..c9917caaa7 100644 --- a/src/Mod/Fem/femtest/utilstest.py +++ b/src/Mod/Fem/femtest/utilstest.py @@ -208,11 +208,11 @@ def compare_stats( "U2", "U3", "Uabs", - #"Sabs", - #"MaxPrin", - #"MidPrin", - #"MinPrin", - #"MaxShear", + "Sabs", + "MaxPrin", + "MidPrin", + "MinPrin", + "MaxShear", "Peeq", "Temp", "MFlow",