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

Eliminated redundant searches for similar orientations in neighboring points…speeds up script by 2 orders of magnitude

This commit is contained in:
Harsha Phukan 2015-09-28 19:03:24 +00:00
parent 0f0b4eaa6b
commit 202ee00049
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
processing/post/addGrainID.py
View File

@ -193,7 +193,7 @@ for name in filenames:
gID = grainID[i] gID = grainID[i]
if gID != -1 and gID not in alreadyChecked: # an already indexed point belonging to a grain not yet tested? if gID != -1 and gID not in alreadyChecked: # an already indexed point belonging to a grain not yet tested?
alreadyChecked[gID] = True # remember not to check again alreadyChecked[gID] = True # remember not to check again
disorientation = o.disorientation(orientations[gID])[0] # compare against that grain's orientation disorientation = o.disorientation(orientations[gID],strict = False)[0] # compare against that grain's orientation [Don't search for axes falling into SST!]
if disorientation.quaternion.w > cos_disorientation and \ if disorientation.quaternion.w > cos_disorientation and \
disorientation.quaternion.w >= bestDisorientation.w: # within disorientation threshold and better than current best? disorientation.quaternion.w >= bestDisorientation.w: # within disorientation threshold and better than current best?
matched = True matched = True
@ -219,7 +219,7 @@ for name in filenames:
for i,orientation in enumerate(orientations[:-1]): # compare each identified orientation... for i,orientation in enumerate(orientations[:-1]): # compare each identified orientation...
for j in xrange(i+1,len(orientations)): # ...against all others that were defined afterwards for j in xrange(i+1,len(orientations)): # ...against all others that were defined afterwards
if orientation.disorientation(orientations[j])[0].quaternion.w > cos_disorientation: # similar orientations in both grainIDs? if orientation.disorientation(orientations[j],strict=False)[0].quaternion.w > cos_disorientation: # similar orientations in both grainIDs?
similarOrientations[i].append(j) # remember in upper triangle... similarOrientations[i].append(j) # remember in upper triangle...
similarOrientations[j].append(i) # ...and lower triangle of matrix similarOrientations[j].append(i) # ...and lower triangle of matrix