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

rotation of matrix is defined in class

This commit is contained in:
Martin Diehl 2019-02-12 06:32:26 +01:00
parent e47c275e0c
commit 4215ae3888
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/damask/orientation.py
View File

@ -45,7 +45,7 @@ class Quaternion2:
def __repr__(self): def __repr__(self):
"""Readable string""" """Readable string"""
return 'Quaternion(real={q:+.6f}, imag=<{p[0]:+.6f}, {p[1]:+.6f}, {p[2]:+.6f}>)'.format(q=self.q,p=self.p) return 'Quaternion: (real={q:+.6f}, imag=<{p[0]:+.6f}, {p[1]:+.6f}, {p[2]:+.6f}>)'.format(q=self.q,p=self.p)
def __add__(self, other): def __add__(self, other):
@ -243,7 +243,7 @@ class Rotation:
def __repr__(self): def __repr__(self):
"""Value in selected representation""" """Value in selected representation"""
return '\n'.join([ return '\n'.join([
'Quaternion: {}'.format(self.quaternion), '{}'.format(self.quaternion),
'Matrix:\n{}'.format( '\n'.join(['\t'.join(list(map(str,self.asMatrix()[i,:]))) for i in range(3)]) ), 'Matrix:\n{}'.format( '\n'.join(['\t'.join(list(map(str,self.asMatrix()[i,:]))) for i in range(3)]) ),
'Bunge Eulers / deg: {}'.format('\t'.join(list(map(str,self.asEulers(degrees=True)))) ), 'Bunge Eulers / deg: {}'.format('\t'.join(list(map(str,self.asEulers(degrees=True)))) ),
]) ])
@ -370,7 +370,7 @@ class Rotation:
A*Vz + B*z + C*(x*Vy - y*Vx), A*Vz + B*z + C*(x*Vy - y*Vx),
]) ])
elif other.shape == (3,3,): elif other.shape == (3,3,):
raise NotImplementedError return np.dot(self.asMatrix(),np.dot(other,self.asMatrix().T))
elif other.shape == (3,3,3,3): elif other.shape == (3,3,3,3):
raise NotImplementedError raise NotImplementedError
else: else: