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

adjust to renaming of from_Eulers/Rodrigues

This commit is contained in:
Philip Eisenlohr 2020-11-18 14:18:05 -05:00
parent 1c9028d0b1
commit 86dfb58732
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 2d00aa541f071dbfc200f32e358d324995a061f5 Subproject commit dd29f2cc9ad2c5310840fabbfb7b5ab3ffadf07a

10
processing/post/addOrientations.py
View File

@ -115,10 +115,10 @@ for name in filenames:
if options.eulers is not None: if options.eulers is not None:
label = options.eulers label = options.eulers
print(np.max(table.get(options.eulers),axis=0)) print(np.max(table.get(options.eulers),axis=0))
o = damask.Rotation.from_Eulers(table.get(options.eulers), options.degrees) o = damask.Rotation.from_Euler_angles(table.get(options.eulers), options.degrees)
elif options.rodrigues is not None: elif options.rodrigues is not None:
label = options.rodrigues label = options.rodrigues
o = damask.Rotation.from_Rodrigues(table.get(options.rodrigues)) o = damask.Rotation.from_Rodrigues_vector(table.get(options.rodrigues))
elif options.matrix is not None: elif options.matrix is not None:
label = options.matrix label = options.matrix
o = damask.Rotation.from_matrix(table.get(options.matrix).reshape(-1,3,3)) o = damask.Rotation.from_matrix(table.get(options.matrix).reshape(-1,3,3))
@ -137,14 +137,14 @@ for name in filenames:
if 'rodrigues' in options.output: if 'rodrigues' in options.output:
table = table.add('ro({})'.format(label),o.as_Rodrigues(), scriptID+' '+' '.join(sys.argv[1:])) table = table.add('ro({})'.format(label),o.as_Rodrigues_vector(), scriptID+' '+' '.join(sys.argv[1:]))
if 'eulers' in options.output: if 'eulers' in options.output:
table = table.add('eu({})'.format(label),o.as_Eulers(options.degrees), scriptID+' '+' '.join(sys.argv[1:])) table = table.add('eu({})'.format(label),o.as_Euler_angles(options.degrees),scriptID+' '+' '.join(sys.argv[1:]))
if 'quaternion' in options.output: if 'quaternion' in options.output:
table = table.add('qu({})'.format(label),o.as_quaternion(), scriptID+' '+' '.join(sys.argv[1:])) table = table.add('qu({})'.format(label),o.as_quaternion(), scriptID+' '+' '.join(sys.argv[1:]))
if 'matrix' in options.output: if 'matrix' in options.output:
table = table.add('om({})'.format(label),o.as_matrix(), scriptID+' '+' '.join(sys.argv[1:])) table = table.add('om({})'.format(label),o.as_matrix(), scriptID+' '+' '.join(sys.argv[1:]))
if 'axisangle' in options.output: if 'axisangle' in options.output:
table = table.add('om({})'.format(label),o.as_axisangle(options.degrees), scriptID+' '+' '.join(sys.argv[1:])) table = table.add('om({})'.format(label),o.as_axis_angle(options.degrees), scriptID+' '+' '.join(sys.argv[1:]))
table.save((sys.stdout if name is None else name), legacy=True) table.save((sys.stdout if name is None else name), legacy=True)