FEM: adapt unit tests on deleting of avg values

FreeCAD · Feb 18, 2020 · a2249c3 · a2249c3
1 parent c2a57b3
commit a2249c3
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 54 deletions.
diff --git a/src/Mod/Fem/femtest/app/support_utils.py b/src/Mod/Fem/femtest/app/support_utils.py
@@ -230,8 +230,8 @@ def compare_stats(
         for s in loc_stat_types:
             statval = resulttools.get_stats(obj, s)
             stats.append(
-                "{}: ({:.10f}, {:.10f}, {:.10f})\n"
-                .format(s, statval[0], statval[1], statval[2])
+                "{}: ({:.10f}, {:.10f})\n"
+                .format(s, statval[0], statval[1])
             )
     else:
         fcc_print("Result object not found. Name: {}".format(res_obj_name))

diff --git a/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_expected_values b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_expected_values
@@ -1,13 +1,13 @@
-U1: (0.0000000000, 0.0000000000, 0.0000000000)
-U2: (0.0000000000, 0.0000000000, 0.0000000000)
-U3: (0.0000000000, 0.0000000000, 0.0000000000)
-Uabs: (0.0000000000, 0.0000000000, 0.0000000000)
-Sabs: (0.0000000000, 0.0000000000, 0.0000000000)
-MaxPrin: (0.0000000000, 0.0000000000, 0.0000000000)
-MidPrin: (0.0000000000, 0.0000000000, 0.0000000000)
-MinPrin: (0.0000000000, 0.0000000000, 0.0000000000)
-MaxShear: (0.0000000000, 0.0000000000, 0.0000000000)
-Peeq: (0.0000000000, 0.0000000000, 0.0000000000)
-Temp: (0.0000000000, 0.0000000000, 0.0000000000)
-MFlow: (78.3918000000, 78.3918000000, 78.3918000000)
-NPress: (0.1000000000, 0.1429887407, 0.1916470000)
+U1: (0.0000000000, 0.0000000000)
+U2: (0.0000000000, 0.0000000000)
+U3: (0.0000000000, 0.0000000000)
+Uabs: (0.0000000000, 0.0000000000)
+Sabs: (0.0000000000, 0.0000000000)
+MaxPrin: (0.0000000000, 0.0000000000)
+MidPrin: (0.0000000000, 0.0000000000)
+MinPrin: (0.0000000000, 0.0000000000)
+MaxShear: (0.0000000000, 0.0000000000)
+Peeq: (0.0000000000, 0.0000000000)
+Temp: (0.0000000000, 0.0000000000)
+MFlow: (78.3918000000, 78.3918000000)
+NPress: (0.1000000000, 0.1916470000)
diff --git a/src/Mod/Fem/femtest/data/ccx/cube_frequency_expected_values b/src/Mod/Fem/femtest/data/ccx/cube_frequency_expected_values
@@ -1,13 +1,13 @@
-U1: (-290.4440000000, 78.2054191786, 448.5130000000)
-U2: (-142.1510000000, 204.5741829964, 551.0200000000)
-U3: (-88.0403000000, -45.8731909643, -3.6648600000)
-Uabs: (69.4067883803, 368.2680867173, 695.6363140635)
-Sabs: (253.7021048384, 1550.5847651870, 3661.8134111820)
-MaxPrin: (-171.6426180829, 920.7394081732, 2877.3028857679)
-MidPrin: (-1053.2688605374, 61.8435529372, 1136.7129381108)
-MinPrin: (-2584.4199852788, -815.2473127390, 288.5989104212)
-MaxShear: (141.8543449888, 867.9933604561, 2036.5588751840)
-Peeq: (0.0000000000, 0.0000000000, 0.0000000000)
-Temp: (0.0000000000, 0.0000000000, 0.0000000000)
-MFlow: (0.0000000000, 0.0000000000, 0.0000000000)
-NPress: (0.0000000000, 0.0000000000, 0.0000000000)
+U1: (-290.4440000000, 448.5130000000)
+U2: (-142.1510000000, 551.0200000000)
+U3: (-88.0403000000, -3.6648600000)
+Uabs: (69.4067883803, 695.6363140635)
+Sabs: (253.7021048384, 3661.8134111820)
+MaxPrin: (-171.6426180829, 2877.3028857679)
+MidPrin: (-1053.2688605374, 1136.7129381108)
+MinPrin: (-2584.4199852788, 288.5989104212)
+MaxShear: (141.8543449888, 2036.5588751840)
+Peeq: (0.0000000000, 0.0000000000)
+Temp: (0.0000000000, 0.0000000000)
+MFlow: (0.0000000000, 0.0000000000)
+NPress: (0.0000000000, 0.0000000000)
diff --git a/src/Mod/Fem/femtest/data/ccx/cube_static_expected_values b/src/Mod/Fem/femtest/data/ccx/cube_static_expected_values
@@ -1,13 +1,13 @@
-U1: (-0.0680669000, -0.0225964098, 0.0029674500)
-U2: (-0.0109484000, 0.0000147168, 0.0110702000)
-U3: (-0.0643181000, -0.0308766826, 0.0000000000)
-Uabs: (0.0000000000, 0.0394629905, 0.0937383460)
-Sabs: (385.3799018170, 1006.7357751359, 2203.5090958167)
-MaxPrin: (-924.0494419697, -23.6402931716, 1169.5484598644)
-MidPrin: (-1260.1000473504, -208.2969867613, 346.8740040676)
-MinPrin: (-3276.2805106799, -1096.4513895842, 3.2401143113)
-MaxShear: (218.1005303160, 536.4055482063, 1176.1155343551)
-Peeq: (0.0000000000, 0.0000000000, 0.0000000000)
-Temp: (0.0000000000, 0.0000000000, 0.0000000000)
-MFlow: (0.0000000000, 0.0000000000, 0.0000000000)
-NPress: (0.0000000000, 0.0000000000, 0.0000000000)
+U1: (-0.0680669000, 0.0029674500)
+U2: (-0.0109484000, 0.0110702000)
+U3: (-0.0643181000, 0.0000000000)
+Uabs: (0.0000000000, 0.0937383460)
+Sabs: (385.3799018170, 2203.5090958167)
+MaxPrin: (-924.0494419697, 1169.5484598644)
+MidPrin: (-1260.1000473504, 346.8740040676)
+MinPrin: (-3276.2805106799, 3.2401143113)
+MaxShear: (218.1005303160, 1176.1155343551)
+Peeq: (0.0000000000, 0.0000000000)
+Temp: (0.0000000000, 0.0000000000)
+MFlow: (0.0000000000, 0.0000000000)
+NPress: (0.0000000000, 0.0000000000)
diff --git a/src/Mod/Fem/femtest/data/ccx/spine_thermomech_expected_values b/src/Mod/Fem/femtest/data/ccx/spine_thermomech_expected_values
@@ -1,13 +1,13 @@
-U1: (-0.0009424550, 0.0030585455, 0.0072981800)
-U2: (-0.0016338200, 0.0006165890, 0.0022231800)
-U3: (-0.0018532900, 0.0005439136, 0.0022067500)
-Uabs: (0.0000000000, 0.0036447827, 0.0073257122)
-Sabs: (0.3071229725, 7.7474585263, 35.8618037277)
-MaxPrin: (-5.8043388849, 1.3112172518, 11.1175902063)
-MidPrin: (-38.5576970149, -4.9005864028, 10.7086318773)
-MinPrin: (-38.5960841002, -6.9926150400, 6.3205092526)
-MaxShear: (0.1766446029, 4.1519161459, 17.9323020685)
-Peeq: (0.0000000000, 0.0000000000, 0.0000000000)
-Temp: (293.4470000000, 299.9189333333, 310.9300000000)
-MFlow: (0.0000000000, 0.0000000000, 0.0000000000)
-NPress: (0.0000000000, 0.0000000000, 0.0000000000)
+U1: (-0.0009424550, 0.0072981800)
+U2: (-0.0016338200, 0.0022231800)
+U3: (-0.0018532900, 0.0022067500)
+Uabs: (0.0000000000, 0.0073257122)
+Sabs: (0.3071229725, 35.8618037277)
+MaxPrin: (-5.8043388849, 11.1175902063)
+MidPrin: (-38.5576970149, 10.7086318773)
+MinPrin: (-38.5960841002, 6.3205092526)
+MaxShear: (0.1766446029, 17.9323020685)
+Peeq: (0.0000000000, 0.0000000000)
+Temp: (293.4470000000, 310.9300000000)
+MFlow: (0.0000000000, 0.0000000000)
+NPress: (0.0000000000, 0.0000000000)