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

math.isclose does not exist for older versions 

np.isclose does the same
This commit is contained in:
Martin Diehl 2018-12-17 20:04:16 +01:00
parent e82d3557d1
commit 5d7f930592
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/damask/orientation.py
View File

@ -161,8 +161,8 @@ class Quaternion:
def __eq__(self,other): def __eq__(self,other):
"""Equal (sufficiently close) to each other""" """Equal (sufficiently close) to each other"""
return math.isclose(( self-other).magnitude(),0.0) \ return np.isclose(( self-other).magnitude(),0.0) \
or math.isclose((-self-other).magnitude(),0.0) or np.isclose((-self-other).magnitude(),0.0)
def __ne__(self,other): def __ne__(self,other):
"""Not equal (sufficiently close) to each other""" """Not equal (sufficiently close) to each other"""
@ -230,10 +230,10 @@ class Quaternion:
angle = 2.0*math.acos(self.q) angle = 2.0*math.acos(self.q)
if math.isclose(angle,0.0): if np.isclose(angle,0.0):
angle = 0.0 angle = 0.0
axis = np.array([0.0,0.0,1.0]) axis = np.array([0.0,0.0,1.0])
elif math.isclose(self.q,0.0): elif np.isclose(self.q,0.0):
angle = math.pi angle = math.pi
axis = self.p axis = self.p
else: else:
@ -244,7 +244,7 @@ class Quaternion:
return np.hstack((angle,axis)) if flat else (angle,axis) return np.hstack((angle,axis)) if flat else (angle,axis)
def asRodrigues(self): def asRodrigues(self):
return np.inf*np.ones(3) if math.isclose(self.q,0.0) else self.p/self.q return np.inf*np.ones(3) if np.isclose(self.q,0.0) else self.p/self.q
def asEulers(self, def asEulers(self,
degrees = False): degrees = False):
@ -255,9 +255,9 @@ class Quaternion:
q12 = self.p[0]**2 + self.p[1]**2 q12 = self.p[0]**2 + self.p[1]**2
chi = np.sqrt(q03*q12) chi = np.sqrt(q03*q12)
if math.isclose(chi,0.0) and math.isclose(q12,0.0): if np.isclose(chi,0.0) and np.isclose(q12,0.0):
eulers = np.array([math.atan2(-2*P*self.q*self.p[2],self.q**2-self.p[2]**2),0,0]) eulers = np.array([math.atan2(-2*P*self.q*self.p[2],self.q**2-self.p[2]**2),0,0])
elif math.isclose(chi,0.0) and math.isclose(q03,0.0): elif np.isclose(chi,0.0) and np.isclose(q03,0.0):
eulers = np.array([math.atan2( 2 *self.p[0]*self.p[1],self.p[0]**2-self.p[1]**2),np.pi,0]) eulers = np.array([math.atan2( 2 *self.p[0]*self.p[1],self.p[0]**2-self.p[1]**2),np.pi,0])
else: else:
eulers = np.array([math.atan2((self.p[0]*self.p[2]-P*self.q*self.p[1])/chi,(-P*self.q*self.p[0]-self.p[1]*self.p[2])/chi), eulers = np.array([math.atan2((self.p[0]*self.p[2]-P*self.q*self.p[1])/chi,(-P*self.q*self.p[0]-self.p[1]*self.p[2])/chi),

2
processing/pre/geom_rotate.py
View File

@ -60,8 +60,6 @@ eulers = np.array(damask.orientation.Orientation(
degrees = options.degrees, degrees = options.degrees,
).asEulers(degrees=True)) ).asEulers(degrees=True))
damask.util.croak('{} {} {}'.format(*eulers))
# --- loop over input files ------------------------------------------------------------------------- # --- loop over input files -------------------------------------------------------------------------
if filenames == []: filenames = [None] if filenames == []: filenames = [None]