py3: FEM, convert map to list

This commit is contained in:
looooo 2017-02-18 21:23:29 +01:00 committed by wmayer
parent 8bc6936bcc
commit 7045113525

View File

@ -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))