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

changed back to old behavior

This commit is contained in:
Martin Diehl 2015-09-11 15:38:03 +00:00
parent 8716752bf8
commit c53bf02fea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
processing/pre/geom_fromTable.py
View File

@ -122,7 +122,7 @@ for name in filenames:
outname = os.path.splitext(name)[0]+'.geom' if name else name, outname = os.path.splitext(name)[0]+'.geom' if name else name,
buffered = False) buffered = False)
except: continue except: continue
table.croak('\033[1m'+scriptName+'\033[0m'+(': '+name if name else '')) table.croak(damask.util.emph(scriptName)+(': '+name if name else ''))
# ------------------------------------------ read head --------------------------------------- # ------------------------------------------ read head ---------------------------------------
@ -217,13 +217,14 @@ for name in filenames:
o = damask.Orientation(quaternion = myData[colOri:colOri+4], o = damask.Orientation(quaternion = myData[colOri:colOri+4],
symmetry = mySym).reduced() symmetry = mySym).reduced()
oInv = o.quaternion.conjugated()
neighbors = KDTree.query_ball_point([x,y,z], 3) # search points within radius neighbors = KDTree.query_ball_point([x,y,z], 3) # search points within radius
breaker = False breaker = False
for n in neighbors: # check each neighbor for n in neighbors: # check each neighbor
if myRank <= rank[n] or table.data[n,colPhase] != myData[colPhase]: continue # skip myself, anyone further ahead (cannot yet have a grain ID), and other phases if myRank <= rank[n] or table.data[n,colPhase] != myData[colPhase]: continue # skip myself, anyone further ahead (cannot yet have a grain ID), and other phases
for symQ in symQuats[microstructure[rank[n]]-1]: for symQ in symQuats[microstructure[rank[n]]-1]:
if (symQ*o.quaternion).asAngleAxis(degrees = options.degrees)[0] <= options.tolerance: # found existing orientation resembling me if (symQ*oInv).asAngleAxis(degrees = options.degrees)[0] <= options.tolerance: # found existing orientation resembling me
microstructure[myRank] = microstructure[rank[n]] microstructure[myRank] = microstructure[rank[n]]
breaker = True; break breaker = True; break
if breaker: break if breaker: break
@ -231,7 +232,7 @@ for name in filenames:
if microstructure[myRank] == 0: # no other orientation resembled me if microstructure[myRank] == 0: # no other orientation resembled me
nGrains += 1 # make new grain ... nGrains += 1 # make new grain ...
microstructure[myRank] = nGrains # ... and assign to me microstructure[myRank] = nGrains # ... and assign to me
symQuats.append(o.symmetry.equivalentQuaternions(o.quaternion.conjugated())) # store all symmetrically equivalent orientations for future comparison symQuats.append(o.symmetry.equivalentQuaternions(o.quaternion)) # store all symmetrically equivalent orientations for future comparison
phases.append(myData[colPhase]) # store phase info for future reporting phases.append(myData[colPhase]) # store phase info for future reporting
myRank += 1 myRank += 1