renamed from 1_ip to 1_ipinitialcoord

processing/post/addCompatibilityMismatch.py

@@ -30,7 +30,7 @@ parser.add_option('-f','--defgrad',     dest='defgrad', metavar='string ',
                                         help='column heading for coordinates [%defgrad]')
 parser.set_defaults(noVolume = False)
 parser.set_defaults(noShape = False)
-parser.set_defaults(coords  = 'ip')
+parser.set_defaults(coords  = 'ipinitialcoord')
 parser.set_defaults(defgrad = 'f')
 
 (options,filenames) = parser.parse_args()

processing/post/addCurl.py

@@ -27,7 +27,7 @@ parser.add_option('-v','--vector',      dest='vector', action='extend', metavar=
                                         help='heading of columns containing vector field values')
 parser.add_option('-t','--tensor',      dest='tensor', action='extend', metavar='<string LIST>',
                                         help='heading of columns containing tensor field values')
-parser.set_defaults(coords = 'ip')
+parser.set_defaults(coords = 'ipinitialcoord')
 parser.set_defaults(vector = [])
 parser.set_defaults(tensor = [])
 

processing/post/addDeformedConfiguration.py

@@ -24,7 +24,7 @@ parser.add_option('-c','--coordinates', dest='coords', metavar='string',
                                         help='column heading for coordinates [%default]')
 parser.add_option('-f','--defgrad',     dest='defgrad', metavar='string',
                                         help='heading of columns containing tensor field values')
-parser.set_defaults(coords  = 'ip')
+parser.set_defaults(coords  = 'ipinitialcoord')
 parser.set_defaults(defgrad = 'f' )
 
 (options,filenames) = parser.parse_args()

processing/post/addDivergence.py

@@ -32,7 +32,7 @@ parser.add_option('-v','--vector',      dest='vector', action='extend', metavar=
                                         help='heading of columns containing vector field values')
 parser.add_option('-t','--tensor',      dest='tensor', action='extend', metavar='<string LIST>',
                                         help='heading of columns containing tensor field values')
-parser.set_defaults(coords = 'ip')
+parser.set_defaults(coords = 'ipinitialcoord')
 parser.set_defaults(accuracy = [])
 parser.set_defaults(fft = False)
 parser.set_defaults(vector = [])

processing/post/addEuclideanDistance.py

@@ -92,14 +92,14 @@ parser.add_option('-c','--coordinates', dest='coords', metavar='string',
                                         help='column heading for coordinates [%default]')
 parser.add_option('-i','--identifier',  dest='id', metavar = 'string',
                                         help='heading of column containing grain identifier [%default]')
-parser.add_option('-t','--type',          dest = 'type', action = 'extend', type = 'string', metavar = '<string LIST>',
+parser.add_option('-t','--type',        dest = 'type', action = 'extend', type = 'string', metavar = '<string LIST>',
-                  help = 'feature type (%s) '%(', '.join(map(lambda x:'|'.join(x['names']),features))) )
+                                        help = 'feature type (%s) '%(', '.join(map(lambda x:'|'.join(x['names']),features))) )
-parser.add_option('-n','--neighborhood',  dest='neighborhood', choices = neighborhoods.keys(), metavar = 'string',
+parser.add_option('-n','--neighborhood',dest='neighborhood', choices = neighborhoods.keys(), metavar = 'string',
-                  help = 'type of neighborhood (%s) [neumann]'%(', '.join(neighborhoods.keys())))
+                                        help = 'type of neighborhood (%s) [neumann]'%(', '.join(neighborhoods.keys())))
-parser.add_option('-s', '--scale',        dest = 'scale', type = 'float', metavar='float',
+parser.add_option('-s', '--scale',      dest = 'scale', type = 'float', metavar='float',
-                  help = 'voxel size [%default]')
+                                        help = 'voxel size [%default]')
 parser.set_defaults(type = [])
-parser.set_defaults(coords = 'ip')
+parser.set_defaults(coords = 'ipinitialcoord')
 parser.set_defaults(id = 'texture')
 parser.set_defaults(neighborhood = 'neumann')
 parser.set_defaults(scale = 1.0)
@@ -155,7 +155,7 @@ for file in files:
 
 # ------------------------------------------ process data ------------------------------------------
   
-  table.data_readArray([options.coords+'.x',options.coords+'.y',options.coords+'.z',options.id])
+  table.data_readArray(['1_'+options.coords,'2_'+options.coords,'3_'+options.coords,options.id])
 
   coords = [{},{},{}]
   for i in xrange(len(table.data)):

processing/post/averageDown.py

@@ -28,7 +28,7 @@ parser.add_option('-g', '--grid',       dest='grid', type='int', nargs=3, metava
                                         help='grid in x,y,z [autodetect]')
 parser.add_option('-s', '--size',       dest='size', type='float', nargs=3, metavar='float float float',
                                         help='size in x,y,z [autodetect]')
-parser.set_defaults(coords  = 'ip')
+parser.set_defaults(coords  = 'ipinitialcoord')
 parser.set_defaults(packing = [2,2,2])
 parser.set_defaults(shift   = [0,0,0])
 parser.set_defaults(grid    = [0,0,0])

processing/post/blowUp.py

@@ -27,7 +27,7 @@ parser.add_option('-g','--grid',        dest='resolution', type='int', nargs=3,
                                         help='resolution in x,y,z [autodetect]')
 parser.add_option('-s','--size',        dest='dimension', type='float', nargs=3, metavar='int int int',
                                         help='dimension in x,y,z [autodetect]')
-parser.set_defaults(coords  = 'ip')
+parser.set_defaults(coords  = 'ipinitialcoord')
 parser.set_defaults(packing = [2,2,2])
 parser.set_defaults(grid    = [0,0,0])
 parser.set_defaults(size    = [0.0,0.0,0.0])

processing/post/nodesFromCentroids.py

@@ -52,7 +52,7 @@ parser.add_option('-f','--defgrad',    dest='defgrad', type='string',\
                                        help='column heading for position of deformation gradient [%default]')
 
 parser.set_defaults(deformedCentroids    = 'ip_deformed')
-parser.set_defaults(undeformedCentroids  = 'ip')
+parser.set_defaults(undeformedCentroids  = 'ipinitialcoord')
 parser.set_defaults(defgrad              = 'f')
 
 (options,filenames) = parser.parse_args()

processing/post/postResults.py

@@ -1003,8 +1003,8 @@ standard = ['inc'] + \
            {True: ['time'],
             False:[]}[options.time] + \
            ['elem','node','ip','grain'] + \
-           {True: ['1_node','2_node','3_node'],
+           {True: ['1_nodeinitialcoord','2_nodeinitialcoord','3_nodeinitialcoord'],
-            False:['1_ip','2_ip','3_ip']}[options.nodalScalar != []]
+            False:['1_ipinitialcoord','2_ipinitialcoord','3_ipinitialcoord']}[options.nodalScalar != []]
 
 # ---------------------------   loop over positions   --------------------------------
 

processing/post/stddevDown.py

@@ -29,7 +29,7 @@ parser.add_option('-r','--resolution',  dest='resolution', type='int', nargs=3,
                                         help='resolution in x,y,z [autodetect]')
 parser.add_option('-d','--dimension',   dest='dimension', type='float', nargs=3, \
                                         help='dimension in x,y,z [autodetect]')
-parser.set_defaults(coords     = 'ip')
+parser.set_defaults(coords     = 'ipinitialcoord')
 parser.set_defaults(packing    = [2,2,2])
 parser.set_defaults(shift      = [0,0,0])
 parser.set_defaults(resolution = [0,0,0])