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

speed up for inversePole method. Now only performing symmetry equivalence when asked for SST.

This commit is contained in:
Philip Eisenlohr 2015-06-13 11:51:10 +00:00
parent 0efbd4b11f
commit 66ce1d0b33
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/damask/orientation.py
View File

@ -837,12 +837,12 @@ class Orientation:
axis rotated according to orientation (using crystal symmetry to ensure location falls into SST)
'''
for i,q in enumerate(self.symmetry.equivalentQuaternions(self.quaternion)): # test all symmetric equivalent orientations
if SST: # pole requested to be within SST
for i,q in enumerate(self.symmetry.equivalentQuaternions(self.quaternion)): # test all symmetric equivalent orientations
pole = q.conjugated()*axis # align crystal direction to axis
if self.symmetry.inSST(pole): break
if self.symmetry.inSST(pole): print i;break # found SST version
else:
pole = q.conjugated()*axis # align crystal direction to axis
pole = self.quaternion.conjugated()*axis # align crystal direction to axis
return pole
@ -853,7 +853,7 @@ class Orientation:
color = np.zeros(3,'d')
for i,q in enumerate(self.symmetry.equivalentQuaternions(self.quaternion)):
for q in self.symmetry.equivalentQuaternions(self.quaternion):
pole = q.conjugated()*axis # align crystal direction to axis
inSST,color = self.symmetry.inSST(pole,color=True)
if inSST: break
@ -870,14 +870,18 @@ class Orientation:
usage:
a = Orientation(Eulers=np.radians([10, 10, 0]), symmetry='hexagonal')
b = Orientation(Eulers=np.radians([20, 0, 0]), symmetry='hexagonal')
avg = Orientation.getAverageOrientation([a,b])"""
avg = Orientation.getAverageOrientation([a,b])
"""
if not all(isinstance(item, Orientation) for item in orientationList):
raise TypeError("Only instances of Orientation can be averaged.")
n = len(orientationList)
tmp_m = orientationList.pop(0).quaternion.asM()
for tmp_o in orientationList:
tmp_m += tmp_o.quaternion.asM()
eig, vec = np.linalg.eig(tmp_m/n)
return Orientation(quaternion = Quaternion(quatArray = vec.T[eig.argmax()]))
@ -886,9 +890,9 @@ class Orientation:
if relationModel not in ['KS','GT',"GT'",'NW','Bain']: return None
variant = int(abs(direction))
me = 0 if direction > 0 else 1
other = 1 if direction > 0 else 0
variant = variant -1
(me,other) = (0,1) if direction > 0 else (1,0)
variant -= 1 # why not subtracting two lines above??
planes = {'KS': \
np.array([[[ 1, 1, 1],[ 0, 1, 1]],\