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

default type for muliple arguments (not extend) is tuple, not list

This commit is contained in:
Martin Diehl 2017-03-08 18:46:53 +01:00
parent dc387b4060
commit 95a982e002
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
processing/pre/geom_addPrimitive.py
View File

@ -51,23 +51,22 @@ parser.add_option( '--nonperiodic', dest='periodic', action='store_false',
parser.add_option( '--voxelspace', dest='voxelspace', action='store_true', parser.add_option( '--voxelspace', dest='voxelspace', action='store_true',
help = '-c and -d are given in (0 to grid) coordinates instead of (origin to origin+size) \ help = '-c and -d are given in (0 to grid) coordinates instead of (origin to origin+size) \
coordinates [%default]') coordinates [%default]')
parser.set_defaults(center = [0,0,0], parser.set_defaults(center = (.0,.0,.0),
fill = 0, fill = 0,
quaternion = [],
angleaxis = [],
degrees = False, degrees = False,
exponent = [1e10,1e10,1e10], # box shape by default exponent = (1e10,1e10,1e10), # box shape by default
periodic = True, periodic = True,
voxelspace = False voxelspace = False
) )
(options, filenames) = parser.parse_args() (options, filenames) = parser.parse_args()
if options.dimension is None:
if options.angleaxis != []: parser.error('no dimension specified.')
if options.angleaxis is not None:
options.angleaxis = map(float,options.angleaxis) options.angleaxis = map(float,options.angleaxis)
rotation = damask.Quaternion().fromAngleAxis(np.radians(options.angleaxis[0]) if options.degrees else options.angleaxis[0], rotation = damask.Quaternion().fromAngleAxis(np.radians(options.angleaxis[0]) if options.degrees else options.angleaxis[0],
options.angleaxis[1:4]) options.angleaxis[1:4])
elif options.quaternion != []: elif options.quaternion is not None:
options.quaternion = map(float,options.quaternion) options.quaternion = map(float,options.quaternion)
rotation = damask.Quaternion(options.quaternion) rotation = damask.Quaternion(options.quaternion)
else: else:
@ -125,7 +124,7 @@ for name in filenames:
# coordinates given in real space (default) vs voxel space # coordinates given in real space (default) vs voxel space
if not options.voxelspace: if not options.voxelspace:
options.center += info['origin'] options.center += info['origin']
options.center *= np.array(info['grid']) / np.array(info['size']) options.center *= np.array(info['grid']) / np.array(info['size'])
options.dimension *= np.array(info['grid']) / np.array(info['size']) options.dimension *= np.array(info['grid']) / np.array(info['size'])