From 742effc90a08216a4b9b45fa21abb559049e1163 Mon Sep 17 00:00:00 2001 From: looooo Date: Sat, 18 Feb 2017 21:23:29 +0100 Subject: [PATCH] py3: FEM, convert map to list --- src/Mod/Fem/importCcxFrdResults.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Mod/Fem/importCcxFrdResults.py b/src/Mod/Fem/importCcxFrdResults.py index b83a5bca9d..11968e147a 100644 --- a/src/Mod/Fem/importCcxFrdResults.py +++ b/src/Mod/Fem/importCcxFrdResults.py @@ -130,10 +130,10 @@ def importFrd(filename, analysis=None, result_name_prefix=None): scale = 1.0 if len(disp) > 0: - results.DisplacementVectors = map((lambda x: x * scale), disp.values()) - results.StressVectors = map((lambda x: x * scale), stressv.values()) - results.StrainVectors = map((lambda x: x * scale), strainv.values()) - results.NodeNumbers = disp.keys() + results.DisplacementVectors = list(map((lambda x: x * scale), disp.values())) + results.StressVectors = list(map((lambda x: x * scale), stressv.values())) + results.StrainVectors = list(map((lambda x: x * scale), strainv.values())) + results.NodeNumbers = list(disp.keys()) if(mesh_object): results.Mesh = mesh_object @@ -170,10 +170,10 @@ def importFrd(filename, analysis=None, result_name_prefix=None): prinstress3.append(prin3) shearstress.append(shear) if eigenmode_number > 0: - results.StressValues = map((lambda x: x * scale), mstress) - results.PrincipalMax = map((lambda x: x * scale), prinstress1) - results.PrincipalMed = map((lambda x: x * scale), prinstress2) - results.PrincipalMin = map((lambda x: x * scale), prinstress3) + results.StressValues = list(map((lambda x: x * scale), mstress)) + results.PrincipalMax = list(map((lambda x: x * scale), prinstress1)) + results.PrincipalMed = list(map((lambda x: x * scale), prinstress2)) + results.PrincipalMin = list(map((lambda x: x * scale), prinstress3)) results.MaxShear = map((lambda x: x * scale), shearstress) results.Eigenmode = eigenmode_number else: @@ -183,10 +183,10 @@ def importFrd(filename, analysis=None, result_name_prefix=None): results.PrincipalMin = prinstress3 results.MaxShear = shearstress - if (results.NodeNumbers != 0 and results.NodeNumbers != stress.keys()): + if (results.NodeNumbers != 0 and results.NodeNumbers != list(stress.keys())): print("Inconsistent FEM results: element number for Stress doesn't equal element number for Displacement {} != {}" .format(results.NodeNumbers, len(results.StressValues))) - results.NodeNumbers = stress.keys() + results.NodeNumbers = list(stress.keys()) x_min, y_min, z_min = map(min, zip(*displacement)) sum_list = map(sum, zip(*displacement))