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

now compatible with updated Orientation.disorientation() output, i.e., select item [0] (the quaternion).

This commit is contained in:
Philip Eisenlohr 2015-08-24 14:20:09 +00:00
parent c215139ce1
commit 7961b486cb
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
processing/post/addGrainID.py
View File

@ -186,15 +186,14 @@ for name in filenames:
if not matched: if not matched:
alreadyChecked = {} alreadyChecked = {}
bestDisorientation = damask.Orientation(quaternion = np.array([0,0,0,1]), bestDisorientation = damask.Quaternion([0,0,0,1]) # initialize to 180 deg rotation as worst case
symmetry = options.symmetry) # initialize to 180 deg rotation as worst case
for i in kdtree.query_ball_point(kdtree.data[p],options.radius): # check all neighboring points for i in kdtree.query_ball_point(kdtree.data[p],options.radius): # check all neighboring points
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]) # compare against that grain's orientation disorientation = o.disorientation(orientations[gID])[0] # compare against that grain's orientation
if disorientation.quaternion.w > cos_disorientation and \ if disorientation.w > cos_disorientation and \
disorientation.quaternion.w >= bestDisorientation.quaternion.w: # within disorientation threshold and better than current best? disorientation.w >= bestDisorientation.w: # within disorientation threshold and better than current best?
matched = True matched = True
matchedID = gID # remember that grain matchedID = gID # remember that grain
bestDisorientation = disorientation bestDisorientation = disorientation
@ -216,14 +215,14 @@ for name in filenames:
memberCounts = np.array(memberCounts) memberCounts = np.array(memberCounts)
similarOrientations = [[] for i in xrange(len(orientations))] similarOrientations = [[] for i in xrange(len(orientations))]
for i,orientation in enumerate(orientations): # 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]).quaternion.w > cos_disorientation: # similar orientations in both grainIDs? if orientation.disorientation(orientations[j])[0].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
if similarOrientations[i] != []: if similarOrientations[i] != []:
bg.set_message('grainID {} is as: {}'.format(i,' '.join(map(lambda x:str(x),similarOrientations[i])))) bg.set_message('grainID {} is as: {}'.format(i,' '.join(map(str,similarOrientations[i]))))
stillShifting = True stillShifting = True
while stillShifting: while stillShifting:
@ -249,10 +248,12 @@ for name in filenames:
stillShifting = True stillShifting = True
table.data_rewind() table.data_rewind()
outputAlive = True
p = 0 p = 0
while table.data_read(): # read next data line of ASCII table while outputAlive and table.data_read(): # read next data line of ASCII table
table.data_append(1+grainID[p]) # add grain ID table.data_append(1+grainID[p]) # add grain ID
table.data_write() # output processed line outputAlive = table.data_write() # output processed line
p += 1 p += 1
bg.set_message('done after {} seconds'.format(time.clock()-start)) bg.set_message('done after {} seconds'.format(time.clock()-start))