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

Merge remote branch 'origin/development' into pheno+

This commit is contained in:
zhangc43 2016-04-21 13:58:04 -04:00
parent a99529b9b0 c57c76085f
commit 6f62ca1ee8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processing/post/addCompatibilityMismatch.py
View File

@ -36,7 +36,7 @@ parser.add_option('--no-volume','-v',
dest = 'volume', dest = 'volume',
action = 'store_false', action = 'store_false',
help = 'omit volume mismatch') help = 'omit volume mismatch')
parser.set_defaults(coords = 'ipinitialcoord', parser.set_defaults(coords = 'pos',
defgrad = 'f', defgrad = 'f',
shape = True, shape = True,
volume = True, volume = True,

4
processing/post/blowUp.py
View File

@ -76,9 +76,9 @@ for name in filenames:
# --------------- figure out size and grid --------------------------------------------------------- # --------------- figure out size and grid ---------------------------------------------------------
table.data_readArray(options.coords) table.data_readArray()
coords = [np.unique(table.data[:,i]) for i in xrange(3)] coords = [np.unique(table.data[:,colCoord+i]) for i in xrange(3)]
mincorner = np.array(map(min,coords)) mincorner = np.array(map(min,coords))
maxcorner = np.array(map(max,coords)) maxcorner = np.array(map(max,coords))
grid = np.array(map(len,coords),'i') grid = np.array(map(len,coords),'i')

3
processing/post/postResults.py
View File

@ -1003,7 +1003,8 @@ fileOpen = False
assembleHeader = True assembleHeader = True
header = [] header = []
standard = ['inc'] + \ standard = ['inc'] + \
['time'] if options.time else [] + \ {True: ['time'],
False:[]}[options.time] + \
['elem','node','ip','grain','1_pos','2_pos','3_pos'] ['elem','node','ip','grain','1_pos','2_pos','3_pos']
# --------------------------- loop over positions -------------------------------- # --------------------------- loop over positions --------------------------------