Merge remote branch 'origin/development' into pheno+

processing/post/addCompatibilityMismatch.py

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

processing/post/blowUp.py

@@ -76,9 +76,9 @@ for name in filenames:
 
 # --------------- 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))
   maxcorner = np.array(map(max,coords))
   grid   = np.array(map(len,coords),'i')

processing/post/postResults.py

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