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

polished formatting of comments

This commit is contained in:
Philip Eisenlohr 2018-12-08 12:01:46 -05:00
parent 3d9d70e829
commit 1de37b9397
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/damask/orientation.py
View File

@ -87,11 +87,11 @@ class Quaternion:
"""Multiplication""" """Multiplication"""
# Rowenhorst_etal2015 MSMSE: value of P is selected as -1 # Rowenhorst_etal2015 MSMSE: value of P is selected as -1
P = -1.0 P = -1.0
try: # quaternion try: # quaternion
return self.__class__(q=self.q*other.q - np.dot(self.p,other.p), return self.__class__(q=self.q*other.q - np.dot(self.p,other.p),
p=self.q*other.p + other.q*self.p + P * np.cross(self.p,other.p)) p=self.q*other.p + other.q*self.p + P * np.cross(self.p,other.p))
except: pass except: pass
try: # vector (perform passive rotation) try: # vector (perform passive rotation)
( x, y, z) = self.p ( x, y, z) = self.p
(Vx,Vy,Vz) = other[0:3] (Vx,Vy,Vz) = other[0:3]
A = self.q*self.q - np.dot(self.p,self.p) A = self.q*self.q - np.dot(self.p,self.p)
@ -104,7 +104,7 @@ class Quaternion:
A*Vz + B*z + C*(x*Vy - y*Vx), A*Vz + B*z + C*(x*Vy - y*Vx),
]) ])
except: pass except: pass
try: # scalar try: # scalar
return self.__class__(q=self.q*other, return self.__class__(q=self.q*other,
p=self.p*other) p=self.p*other)
except: except:
@ -114,7 +114,7 @@ class Quaternion:
"""In-place multiplication""" """In-place multiplication"""
# Rowenhorst_etal2015 MSMSE: value of P is selected as -1 # Rowenhorst_etal2015 MSMSE: value of P is selected as -1
P = -1.0 P = -1.0
try: # Quaternion try: # Quaternion
self.q = self.q*other.q - np.dot(self.p,other.p) self.q = self.q*other.q - np.dot(self.p,other.p)
self.p = self.q*other.p + other.q*self.p + P * np.cross(self.p,other.p) self.p = self.q*other.p + other.q*self.p + P * np.cross(self.p,other.p)
except: pass except: pass
@ -237,7 +237,7 @@ class Quaternion:
def asList(self): def asList(self):
return [self.q]+list(self.p) return [self.q]+list(self.p)
def asM(self): # to find Averaging Quaternions (see F. Landis Markley et al.) def asM(self): # to find Averaging Quaternions (see F. Landis Markley et al.)
return np.outer(self.asList(),self.asList()) return np.outer(self.asList(),self.asList())
def asMatrix(self): def asMatrix(self):
@ -300,7 +300,7 @@ class Quaternion:
math.atan2((P*self.q*self.p[1]+self.p[0]*self.p[2])/chi,( self.p[1]*self.p[2]-P*self.q*self.p[0])/chi), math.atan2((P*self.q*self.p[1]+self.p[0]*self.p[2])/chi,( self.p[1]*self.p[2]-P*self.q*self.p[0])/chi),
]) ])
eulers %= 2.0*math.pi eulers %= 2.0*math.pi # enforce positive angles
return np.degrees(eulers) if degrees else eulers return np.degrees(eulers) if degrees else eulers