223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplified boolean dictionaries to “if else” constructs.

This commit is contained in:
Philip Eisenlohr 2015-05-21 00:13:11 +00:00
parent acc2cb656b
commit df5dd98576
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
processing/post/postResults.py
View File

@ -619,7 +619,7 @@ def ParsePostfile(p,filename, outputFormat):
stat['LabelOfElementalScalar'][startIndex + offset] = label stat['LabelOfElementalScalar'][startIndex + offset] = label
offset += 1 offset += 1
stat['IndexOfLabel']['GrainCount'] = startIndex + offset stat['IndexOfLabel']['GrainCount'] = startIndex + offset
stat['LabelOfElementalScalar'][startIndex + offset] = 'GrainCount' # add GrainCount stat['LabelOfElementalScalar'][startIndex + offset] = 'GrainCount' # add GrainCount
offset += 1 offset += 1
if '(ngrains)' in outputFormat['Homogenization']['specials']: if '(ngrains)' in outputFormat['Homogenization']['specials']:
@ -631,20 +631,18 @@ def ParsePostfile(p,filename, outputFormat):
for (name,N) in outputFormat['Crystallite']['outputs']: # add crystallite outputs for (name,N) in outputFormat['Crystallite']['outputs']: # add crystallite outputs
for i in range(N): for i in range(N):
label = {False: '%i_%s'%(grain+1, name), label = '%i_'%(grain+1) + '%i_'%(i+1) if N>1 else '' + name
True:'%i_%i_%s'%(grain+1,i+1,name)}[N > 1]
stat['IndexOfLabel'][label] = startIndex + offset stat['IndexOfLabel'][label] = startIndex + offset
stat['LabelOfElementalScalar'][startIndex + offset] = label stat['LabelOfElementalScalar'][startIndex + offset] = label
offset += 1 offset += 1
stat['IndexOfLabel']['%i_ConstitutiveCount'%(grain+1)] = startIndex + offset # report constitutive count stat['IndexOfLabel']['%i_ConstitutiveCount'%(grain+1)] = startIndex + offset # report constitutive count
stat['LabelOfElementalScalar'][startIndex + offset] = '%i_ConstitutiveCount'%(grain+1) # add GrainCount stat['LabelOfElementalScalar'][startIndex + offset] = '%i_ConstitutiveCount'%(grain+1) # add GrainCount
offset += 1 offset += 1
for (name,N) in outputFormat['Constitutive']['outputs']: # add constitutive outputs for (name,N) in outputFormat['Constitutive']['outputs']: # add constitutive outputs
for i in range(N): for i in range(N):
label = {False: '%i_%s'%(grain+1, name), label = '%i_'%(grain+1) + ('%i_'%(i+1) if N>1 else '') + name
True:'%i_%i_%s'%(grain+1,i+1,name)}[N > 1]
stat['IndexOfLabel'][label] = startIndex + offset stat['IndexOfLabel'][label] = startIndex + offset
try: try:
stat['LabelOfElementalScalar'][startIndex + offset] = label stat['LabelOfElementalScalar'][startIndex + offset] = label