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

polishing

This commit is contained in:
Martin Diehl 2020-04-11 20:42:46 +02:00
parent c57f96cd6e
commit c0c37fe6a5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/damask/_rotation.py
View File

@ -502,7 +502,7 @@ class Rotation:
np.ones( qu.shape[:-1]+(1,))*np.pi, np.ones( qu.shape[:-1]+(1,))*np.pi,
np.zeros(qu.shape[:-1]+(1,))]), np.zeros(qu.shape[:-1]+(1,))]),
eu) # TODO: Where can be nested eu) # TODO: Where can be nested
# reduce Euler angles to definition range, i.e a lower limit of 0.0 # reduce Euler angles to definition range
eu[np.abs(eu)<1.e-6] = 0.0 eu[np.abs(eu)<1.e-6] = 0.0
eu = np.where(eu<0, (eu+2.0*np.pi)%np.array([2.0*np.pi,np.pi,2.0*np.pi]),eu) eu = np.where(eu<0, (eu+2.0*np.pi)%np.array([2.0*np.pi,np.pi,2.0*np.pi]),eu)
return eu return eu
@ -530,7 +530,7 @@ class Rotation:
ax = np.where(np.broadcast_to(qu[...,0:1] < 1.0e-6,qu.shape), ax = np.where(np.broadcast_to(qu[...,0:1] < 1.0e-6,qu.shape),
np.block([qu[...,1:4],np.ones(qu.shape[:-1]+(1,))*np.pi]), np.block([qu[...,1:4],np.ones(qu.shape[:-1]+(1,))*np.pi]),
np.block([qu[...,1:4]*s,omega])) np.block([qu[...,1:4]*s,omega]))
ax[np.sum(np.abs(qu[...,1:4])**2,axis=-1) < 1.0e-6,] = [0.0, 0.0, 1.0, 0.0] ax[np.sum(np.abs(qu[...,1:4])**2,axis=-1) < 1.0e-6,] = [0.0, 0.0, 1.0, 0.0]
return ax return ax
@staticmethod @staticmethod
@ -559,10 +559,10 @@ class Rotation:
def qu2ho(qu): def qu2ho(qu):
"""Quaternion to homochoric vector.""" """Quaternion to homochoric vector."""
if len(qu.shape) == 1: if len(qu.shape) == 1:
if np.isclose(qu[0],1.0): omega = 2.0 * np.arccos(np.clip(qu[0],-1.0,1.0))
if np.abs(omega) < 1.0e-12:
ho = np.zeros(3) ho = np.zeros(3)
else: else:
omega = 2.0 * np.arccos(np.clip(qu[0],-1.0,1.0))
ho = np.array([qu[1], qu[2], qu[3]]) ho = np.array([qu[1], qu[2], qu[3]])
f = 0.75 * ( omega - np.sin(omega) ) f = 0.75 * ( omega - np.sin(omega) )
ho = ho/np.linalg.norm(ho) * f**(1./3.) ho = ho/np.linalg.norm(ho) * f**(1./3.)

2
python/tests/test_Rotation.py
View File

@ -167,7 +167,7 @@ class TestRotation:
conversion(qu.reshape(qu.shape[0]//2,-1,4)) conversion(qu.reshape(qu.shape[0]//2,-1,4))
co = conversion(qu) co = conversion(qu)
for q,c in zip(qu,co): for q,c in zip(qu,co):
#print(q,c) print(q,c)
assert np.allclose(conversion(q),c) assert np.allclose(conversion(q),c)
@pytest.mark.parametrize('conversion',[Rotation.om2qu, @pytest.mark.parametrize('conversion',[Rotation.om2qu,