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

Merged branch development into development

This commit is contained in:
Philip Eisenlohr 2016-09-14 19:42:15 -04:00
parent 59c1eee16b 67a5edc93b
commit eb69d6f4f1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v2.0.1-113-g77729f3 v2.0.1-122-g804931d

6
processing/pre/geom_addPrimitive.py
View File

@ -126,9 +126,9 @@ for name in filenames:
primPos = invRotation*gridpos # rotate back to primitive coordinate system primPos = invRotation*gridpos # rotate back to primitive coordinate system
if np.dot(mask*primPos/dim,mask*primPos/dim) <= 0.25 and \ if np.dot(mask*primPos/dim,mask*primPos/dim) <= 0.25 and \
np.all(abs((1.-mask)*primPos/dim) <= 0.5): # inside ellipsoid and inside box np.all(abs((1.-mask)*primPos/dim) <= 0.5): # inside ellipsoid and inside box
microstructure[(gridpos[0]+options.center[0])%info['grid'][0], microstructure[int((gridpos[0]+options.center[0])%info['grid'][0]),
(gridpos[1]+options.center[1])%info['grid'][1], int((gridpos[1]+options.center[1])%info['grid'][1]),
(gridpos[2]+options.center[2])%info['grid'][2]] = options.fill # assign microstructure index int((gridpos[2]+options.center[2])%info['grid'][2])] = options.fill # assign microstructure index
newInfo['microstructures'] = microstructure.max() newInfo['microstructures'] = microstructure.max()