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

bugfix: axis out of bounds for np.repeat, np.tile seems to be ok @Philip: pls check. autodoc friendly help

This commit is contained in:
Martin Diehl 2016-07-15 10:34:17 +02:00
parent 9e8adf731b
commit 7d84b99710
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
processing/pre/geom_fromVoronoiTessellation.py
View File

@ -73,8 +73,7 @@ def laguerreTessellation(undeformed, coords, weights, grains, nonperiodic = Fals
[ 1, 1, 1 ], [ 1, 1, 1 ],
]).astype(float)*info['size'] ]).astype(float)*info['size']
repeatweights = np.repeat(weights,len(copies),axis=1).flatten(order='F') # Laguerre weights (1,2,3,1,2,3,...,1,2,3) repeatweights = np.tile(weights,len(copies)).flatten(order='F') # Laguerre weights (1,2,3,1,2,3,...,1,2,3)
for i,vec in enumerate(copies): # periodic copies of seed points ... for i,vec in enumerate(copies): # periodic copies of seed points ...
try: seeds = np.append(seeds, coords+vec, axis=0) # ... (1+a,2+a,3+a,...,1+z,2+z,3+z) try: seeds = np.append(seeds, coords+vec, axis=0) # ... (1+a,2+a,3+a,...,1+z,2+z,3+z)
except NameError: seeds = coords+vec except NameError: seeds = coords+vec
@ -134,12 +133,12 @@ group.add_option('-g',
'--grid', '--grid',
dest = 'grid', dest = 'grid',
type = 'int', nargs = 3, metavar = ' '.join(['int']*3), type = 'int', nargs = 3, metavar = ' '.join(['int']*3),
help = 'a,b,c grid of hexahedral box [auto]') help = 'a,b,c grid of hexahedral box')
group.add_option('-s', group.add_option('-s',
'--size', '--size',
dest = 'size', dest = 'size',
type = 'float', nargs = 3, metavar=' '.join(['float']*3), type = 'float', nargs = 3, metavar=' '.join(['float']*3),
help = 'x,y,z size of hexahedral box [auto]') help = 'x,y,z size of hexahedral box')
group.add_option('-o', group.add_option('-o',
'--origin', '--origin',
dest = 'origin', dest = 'origin',