diff --git a/processing/misc/yieldSurface.py b/processing/misc/yieldSurface.py index 97d9f229f..7f6324d0c 100755 --- a/processing/misc/yieldSurface.py +++ b/processing/misc/yieldSurface.py @@ -189,7 +189,7 @@ def doSim(delay,thread): while line < lines: if table.data[line,9]>= threshold: upper,lower = table.data[line,9],table.data[line-1,9] # values for linear interpolation - yieldStress[i] = table.data[line-1 0:9] * (upper-threshold)/(upper-lower) \ + yieldStress[i] = table.data[line-1,0:9] * (upper-threshold)/(upper-lower) \ + table.data[line ,0:9] * (threshold-lower)/(upper-lower) # linear interpolation of stress values break else: diff --git a/processing/post/3Dvisualize.py b/processing/post/3Dvisualize.py index 201b98339..4a8fa4f33 100755 --- a/processing/post/3Dvisualize.py +++ b/processing/post/3Dvisualize.py @@ -263,19 +263,19 @@ Coordinates are taken from (consecutive) x, y, and z columns. """, version = scriptID) sepChoices = ['n','t','s'] -parser.add_option('-s', '--scalar', dest='scalar', action='extend', type='string', metavar = '', +parser.add_option('-s', '--scalar', dest='scalar', action='extend', metavar = '', help='list of single scalars to visualize') -parser.add_option( '--double', dest='double', action='extend', type='string', metavar = '', +parser.add_option( '--double', dest='double', action='extend', metavar = '', help='list of two scalars to visualize') -parser.add_option( '--triple', dest='triple', action='extend', type='string', metavar = '', +parser.add_option( '--triple', dest='triple', action='extend', metavar = '', help='list of three scalars to visualize') -parser.add_option( '--quadruple', dest='quadruple', action='extend', type='string', metavar = '', +parser.add_option( '--quadruple', dest='quadruple', action='extend', metavar = '', help='list of four scalars to visualize') -parser.add_option('-v', '--vector', dest='vector', action='extend', type='string', metavar = '', +parser.add_option('-v', '--vector', dest='vector', action='extend', metavar = '', help='list of vectors to visualize') -parser.add_option('-t', '--tensor', dest='tensor', action='extend', type='string', metavar = '', +parser.add_option('-t', '--tensor', dest='tensor', action='extend', metavar = '', help='list of tensors to visualize') -parser.add_option('-d', '--deformation', dest='defgrad', action='store', type='string', metavar = 'string', +parser.add_option('-d', '--deformation', dest='defgrad', metavar = 'string', help='heading of deformation gradient columns [%default]') parser.add_option('--reference', dest='undeformed', action='store_true', help='map results to reference (undeformed) configuration [%default]') @@ -291,15 +291,15 @@ parser.add_option('--points', dest='output_points', action='store_true', help='produce VTK points file [%default]') parser.add_option('--nopoints', dest='output_points', action='store_false', help='omit VTK points file') -parser.add_option('--separator', dest='separator', action='store', type='choice', choices=sepChoices, metavar='string', +parser.add_option('--separator', dest='separator', type='choice', choices=sepChoices, metavar='string', help='data separator (%s) [t]'%(','.join(map(str,sepChoices)))) parser.add_option('--scaling', dest='scaling', action='extend', type='string', help='scaling of fluctuation', metavar = '') -parser.add_option('-u', '--unitlength', dest='unitlength', action='store', type='float', metavar = 'float', +parser.add_option('-u', '--unitlength', dest='unitlength', type='float', metavar = 'float', help='set unit length for 2D model [%default]') -parser.add_option('--filenodalcoords', dest='filenodalcoords', action='store', type='string', metavar = 'string', +parser.add_option('--filenodalcoords', dest='filenodalcoords', metavar = 'string', help='ASCII table containing nodal coords') -parser.add_option('--labelnodalcoords', dest='labelnodalcoords', action='store', type='string', nargs=3, +parser.add_option('--labelnodalcoords', dest='labelnodalcoords', nargs=3, help='labels of nodal coords in ASCII table %default', metavar = 'string string string') parser.add_option('-l', '--linear', dest='linearreconstruction', action='store_true', help='use linear reconstruction of geometry [%default]') diff --git a/processing/post/addCalculation.py b/processing/post/addCalculation.py index 0bb1f874b..f01a6c473 100755 --- a/processing/post/addCalculation.py +++ b/processing/post/addCalculation.py @@ -26,9 +26,9 @@ Example: distance to IP coordinates -- "math.sqrt( #ip.x#**2 + #ip.y#**2 + round """, version = scriptID) -parser.add_option('-l','--label', dest='labels', action='extend', type='string', metavar='', +parser.add_option('-l','--label', dest='labels', action='extend', metavar='', help='(list of) new column labels') -parser.add_option('-f','--formula', dest='formulas', action='extend', type='string', metavar='', +parser.add_option('-f','--formula', dest='formulas', action='extend', metavar='', help='(list of) formulas corresponding to labels') parser.set_defaults(labels= []) parser.set_defaults(formulas= []) diff --git a/processing/post/addCauchy.py b/processing/post/addCauchy.py index 6d3bb081c..8f46292ee 100755 --- a/processing/post/addCauchy.py +++ b/processing/post/addCauchy.py @@ -19,9 +19,9 @@ Add column(s) containing Cauchy stress based on given column(s) of deformation g """, version = scriptID) -parser.add_option('-f','--defgrad', dest='defgrad', action='store', type='string', metavar='string', +parser.add_option('-f','--defgrad', dest='defgrad', metavar='string', help='heading of columns containing deformation gradient [%default]') -parser.add_option('-p','--stress', dest='stress', action='store', type='string', metavar='string', +parser.add_option('-p','--stress', dest='stress', metavar='string', help='heading of columns containing first Piola--Kirchhoff stress [%default]') parser.set_defaults(defgrad = 'f') parser.set_defaults(stress = 'p') diff --git a/processing/post/addCauchyX.py b/processing/post/addCauchyX.py index 29a2cb0e7..982bb6961 100755 --- a/processing/post/addCauchyX.py +++ b/processing/post/addCauchyX.py @@ -38,11 +38,11 @@ deformation gradient and first Piola--Kirchhoff stress. ) -parser.add_option('-f','--defgrad', dest='defgrad', type='string', \ +parser.add_option('-f','--defgrad', dest='defgrad', \ help='heading of columns containing deformation gradient [%default]') -parser.add_option('-p','--stress', dest='stress', type='string', \ +parser.add_option('-p','--stress', dest='stress', \ help='heading of columns containing first Piola--Kirchhoff stress [%default]') -parser.add_option('-o','--output', dest='output', type='string', \ +parser.add_option('-o','--output', dest='output', \ help='group containing requested data [%default]') parser.set_defaults(defgrad = 'f') parser.set_defaults(stress = 'p') diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index 26d44f81c..050845929 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -24,9 +24,9 @@ parser.add_option('--no-shape','-s', dest='noShape', action='store_false', help='do not calcuate shape mismatch [%default]') parser.add_option('--no-volume','-v', dest='noVolume', action='store_false', help='do not calculate volume mismatch [%default]') -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-f','--defgrad', dest='defgrad', action='store', type='string', metavar='string ', +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) diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 6cf137cba..3b502fad2 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -21,11 +21,11 @@ Deals with both vector- and tensor-valued fields. """, version = scriptID) -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', metavar='', +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', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') parser.set_defaults(coords = 'ip') parser.set_defaults(vector = []) diff --git a/processing/post/addDeformedConfiguration.py b/processing/post/addDeformedConfiguration.py index 92d564e80..696779de8 100755 --- a/processing/post/addDeformedConfiguration.py +++ b/processing/post/addDeformedConfiguration.py @@ -20,9 +20,9 @@ Operates on periodic ordered three-dimensional data sets. """, version = scriptID) -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-f','--defgrad', dest='defgrad', action='store', type='string', metavar='string', +parser.add_option('-f','--defgrad', dest='defgrad', metavar='string', help='heading of columns containing tensor field values') parser.add_option('-l', '--linear', dest='linearreconstruction', action='store_true', help='use linear reconstruction of geometry [%default]') diff --git a/processing/post/addDeterminant.py b/processing/post/addDeterminant.py index ea07b6b77..c889f442a 100755 --- a/processing/post/addDeterminant.py +++ b/processing/post/addDeterminant.py @@ -26,7 +26,7 @@ Add column(s) containing determinant of requested tensor column(s). """, version = scriptID) -parser.add_option('-t','--tensor', dest='tensor', action='extend', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') parser.set_defaults(tensor = []) diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index aa93bdc8f..25a22310c 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -22,15 +22,15 @@ Deals with both vector- and tensor-valued fields. """, version = scriptID) accuracyChoices = ['2','4','6','8'] -parser.add_option('--fdm', dest='accuracy', action='extend', type='string', metavar='', +parser.add_option('--fdm', dest='accuracy', action='extend', metavar='', help='degree of central difference accuracy (%s)'%(','.join(accuracyChoices))) parser.add_option('--fft', dest='fft', action='store_true', help='calculate divergence in Fourier space') -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar = 'string', +parser.add_option('-c','--coordinates', dest='coords', metavar = 'string', help='column heading for coordinates [%default]') -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', metavar='', +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', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') parser.set_defaults(coords = 'ip') parser.set_defaults(accuracy = []) diff --git a/processing/post/addEhkl.py b/processing/post/addEhkl.py index 3e6505473..5aabe56d1 100755 --- a/processing/post/addEhkl.py +++ b/processing/post/addEhkl.py @@ -36,10 +36,10 @@ Add column(s) containing directional stiffness based on given cubic stiffness va """, version = scriptID) -parser.add_option('-c','--stiffness', dest='vector', action='extend', type='string', metavar='', +parser.add_option('-c','--stiffness', dest='vector', action='extend', metavar='', help='heading of column containing C11 (followed by C12, C44) field values') parser.add_option('-d','--direction', \ - '--hkl', dest='hkl', action='store', type='int', nargs=3, metavar='int int int', + '--hkl', dest='hkl', type='int', nargs=3, metavar='int int int', help='direction of elastic modulus %default') parser.set_defaults(vector = []) parser.set_defaults(hkl = [1,1,1]) diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index 9b9adbed5..296971a9b 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -87,13 +87,13 @@ Add column(s) containing Euclidean distance to grain structural features: bounda """, version = scriptID) -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-i','--identifier', dest='id', action='store', type='string', metavar = 'string', +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='', +parser.add_option('-t','--type', dest='type', action='extend', metavar='', help='feature type (%s)'%(', '.join(map(lambda x:', '.join([x['name']]),features)))) -parser.add_option('-n','--neighborhood',dest='neigborhood', action='store', type='choice', +parser.add_option('-n','--neighborhood',dest='neigborhood', type='choice', choices=neighborhoods.keys(), metavar='string', help='type of neighborhood (%s) [neumann]'%(', '.join(neighborhoods.keys()))) parser.set_defaults(type = []) diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index a17320286..c7509026c 100755 --- a/processing/post/addIPFcolor.py +++ b/processing/post/addIPFcolor.py @@ -18,24 +18,24 @@ Add RGB color value corresponding to TSL-OIM scheme for inverse pole figures. """, version = scriptID) -parser.add_option('-p', '--pole', dest='pole', action='store', type='float', nargs=3, metavar='float float float', +parser.add_option('-p', '--pole', dest='pole', type='float', nargs=3, metavar='float float float', help = 'lab frame direction for inverse pole figure %default') -parser.add_option('-s', '--symmetry', dest='symmetry', action='store', type='choice', +parser.add_option('-s', '--symmetry', dest='symmetry', type='choice', choices=damask.Symmetry.lattices[1:], metavar='string', help = 'crystal symmetry (%s) [cubic]'%(', '.join(damask.Symmetry.lattices[1:]))) -parser.add_option('-e', '--eulers', dest='eulers', action='store', type='string', metavar='string', +parser.add_option('-e', '--eulers', dest='eulers', metavar='string', help = 'Euler angles label') parser.add_option('-d', '--degrees', dest='degrees', action='store_true', help = 'Euler angles are given in degrees [%default]') -parser.add_option('-m', '--matrix', dest='matrix', action='store', type='string', metavar='string', +parser.add_option('-m', '--matrix', dest='matrix', metavar='string', help = 'orientation matrix label') -parser.add_option('-a', dest='a', action='store', type='string', metavar='string', +parser.add_option('-a', dest='a', metavar='string', help = 'crystal frame a vector label') -parser.add_option('-b', dest='b', action='store', type='string', metavar='string', +parser.add_option('-b', dest='b', metavar='string', help = 'crystal frame b vector label') -parser.add_option('-c', dest='c', action='store', type='string', metavar='string', +parser.add_option('-c', dest='c', metavar='string', help = 'crystal frame c vector label') -parser.add_option('-q', '--quaternion', dest='quaternion', action='store', type='string', metavar='string', +parser.add_option('-q', '--quaternion', dest='quaternion', metavar='string', help = 'quaternion label') parser.set_defaults(pole = [0.0,0.0,1.0]) parser.set_defaults(symmetry = 'cubic') diff --git a/processing/post/addMapped.py b/processing/post/addMapped.py index ae43a3c28..3bdc1f389 100755 --- a/processing/post/addMapped.py +++ b/processing/post/addMapped.py @@ -17,19 +17,19 @@ Add data in column(s) of second ASCIItable selected from row that is given by th """, version = scriptID) -parser.add_option('-a','--asciitable', dest='asciitable', action='store', type='string', metavar='string', +parser.add_option('-a','--asciitable', dest='asciitable', metavar='string', help='mapped ASCIItable') -parser.add_option('-c','--map', dest='map', action='store', type='string', metavar='string', +parser.add_option('-c','--map', dest='map', metavar='string', help='heading of column containing row mapping') -parser.add_option('-o','--offset', dest='offset', action='store', type='int', metavar='int', +parser.add_option('-o','--offset', dest='offset', type='int', metavar='int', help='offset between mapped column value and row') -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', metavar='', +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', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') -parser.add_option('-s','--special', dest='special', action='extend', type='string', metavar='', +parser.add_option('-s','--special', dest='special', action='extend', metavar='', help='heading of columns containing field values of special dimension') -parser.add_option('-d','--dimension', dest='N', action='store', type='int', metavar='int', +parser.add_option('-d','--dimension', dest='N', type='int', metavar='int', help='dimension of special field values [%default]') parser.set_defaults(vector = []) parser.set_defaults(tensor = []) diff --git a/processing/post/addMises.py b/processing/post/addMises.py index 7ff7f3100..f552010af 100755 --- a/processing/post/addMises.py +++ b/processing/post/addMises.py @@ -29,9 +29,9 @@ Add vonMises equivalent values for symmetric part of requested strains and/or st """, version = scriptID) -parser.add_option('-e','--strain', dest='strain', action='extend', type='string', metavar='', +parser.add_option('-e','--strain', dest='strain', action='extend', metavar='', help='heading(s) of columns containing strain tensors') -parser.add_option('-s','--stress', dest='stress', action='extend', type='string', metavar='', +parser.add_option('-s','--stress', dest='stress', action='extend', metavar='', help='heading(s) of columns containing stress tensors') parser.set_defaults(strain = []) parser.set_defaults(stress = []) diff --git a/processing/post/addNorm.py b/processing/post/addNorm.py index 2c89e1fdb..e55d944ce 100755 --- a/processing/post/addNorm.py +++ b/processing/post/addNorm.py @@ -29,15 +29,15 @@ Add column(s) containing norm of requested column(s) being either vectors or ten """, version = scriptID) normChoices = ['abs','frobenius','max'] -parser.add_option('-n','--norm', dest='norm', action='store', type='choice', choices=normChoices, metavar='string', +parser.add_option('-n','--norm', dest='norm', type='choice', choices=normChoices, metavar='string', help='type of element-wise p-norm (%s) [frobenius]'%(','.join(map(str,normChoices)))) -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', metavar='', +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', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') -parser.add_option('-s','--special', dest='special', action='extend', type='string', metavar='', +parser.add_option('-s','--special', dest='special', action='extend', metavar='', help='heading of columns containing field values of special dimension') -parser.add_option('-d','--dimension', dest='N', action='store', type='int', metavar='int', +parser.add_option('-d','--dimension', dest='N', type='int', metavar='int', help='dimension of special field values [%default]') parser.set_defaults(norm = 'frobenius') parser.set_defaults(vector = []) diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index a88eb78f1..9c6c88894 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -20,26 +20,26 @@ Orientation is given by quaternion, Euler angles, rotation matrix, or crystal fr """, version = scriptID) outputChoices = ['quaternion','eulers'] -parser.add_option('-o', '--output', dest='output', action='extend', type='string', metavar='', +parser.add_option('-o', '--output', dest='output', action='extend', metavar='', help = 'output orientation formats (%s)'%(','.join(outputChoices))) -parser.add_option('-s', '--symmetry', dest='symmetry', action='store', type='choice', +parser.add_option('-s', '--symmetry', dest='symmetry', type='choice', choices=damask.Symmetry.lattices[1:], metavar='string', help = 'crystal symmetry (%s) [cubic]'%(', '.join(damask.Symmetry.lattices[1:]))) -parser.add_option('-r', '--rotation', dest='rotation', action='store', type='float', nargs=4, metavar='float float float float', +parser.add_option('-r', '--rotation', dest='rotation', type='float', nargs=4, metavar='float float float float', help = 'angle and axis to (pre)rotate orientation') -parser.add_option('-e', '--eulers', dest='eulers', action='store', type='string', metavar='string', +parser.add_option('-e', '--eulers', dest='eulers', metavar='string', help = 'Euler angles label') parser.add_option('-d', '--degrees', dest='degrees', action='store_true', help = 'Euler angles are given in degrees [%default]') -parser.add_option('-m', '--matrix', dest='matrix', action='store', type='string', metavar='string', +parser.add_option('-m', '--matrix', dest='matrix', metavar='string', help = 'orientation matrix label') -parser.add_option('-a', dest='a', action='store', type='string', metavar='string', +parser.add_option('-a', dest='a', metavar='string', help = 'crystal frame a vector label') -parser.add_option('-b', dest='b', action='store', type='string', metavar='string', +parser.add_option('-b', dest='b', metavar='string', help = 'crystal frame b vector label') -parser.add_option('-c', dest='c', action='store', type='string', metavar='string', +parser.add_option('-c', dest='c', metavar='string', help = 'crystal frame c vector label') -parser.add_option('-q', '--quaternion', dest='quaternion', action='store', type='string', metavar='string', +parser.add_option('-q', '--quaternion', dest='quaternion', metavar='string', help = 'quaternion label') parser.set_defaults(output = []) parser.set_defaults(symmetry = 'cubic') diff --git a/processing/post/addPK2.py b/processing/post/addPK2.py index d5e8326fb..32b199dc4 100755 --- a/processing/post/addPK2.py +++ b/processing/post/addPK2.py @@ -19,9 +19,9 @@ Add column(s) containing Second Piola--Kirchhoff stress based on given column(s) """, version = scriptID) -parser.add_option('-f','--defgrad', dest='defgrad', action='store', type='string', metavar='string', +parser.add_option('-f','--defgrad', dest='defgrad', metavar='string', help='heading of columns containing deformation gradient [%default]') -parser.add_option('-p','--stress', dest='stress', action='store', type='string', metavar='string', +parser.add_option('-p','--stress', dest='stress', metavar='string', help='heading of columns containing first Piola--Kirchhoff stress [%default]') parser.set_defaults(defgrad = 'f') parser.set_defaults(stress = 'p') diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py index 4e0f07468..82f241c71 100755 --- a/processing/post/addSchmidfactors.py +++ b/processing/post/addSchmidfactors.py @@ -247,20 +247,20 @@ Add columns listing Schmid factors (and optional trace vector of selected system """, version = scriptID) -parser.add_option('-l','--lattice', dest='lattice', action='store', type='choice', +parser.add_option('-l','--lattice', dest='lattice', type='choice', choices=('fcc','bcc','hex'), metavar='string', help="type of neighborhood ('fcc','bcc','hex') [%default]") -parser.add_option('--direction', dest='forcedirection', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('--direction', dest='forcedirection', type='int', nargs=3, metavar='int int int', help='force direction in lab coordinates %default') -parser.add_option('-n','--normal', dest='stressnormal', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-n','--normal', dest='stressnormal', type='int', nargs=3, metavar='int int int', help='stress plane normal in lab coordinates ') -parser.add_option('--trace', dest='traceplane', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('--trace', dest='traceplane', type='int', nargs=3, metavar='int int int', help='normal (in lab coordinates) of plane on which the plane trace of the Schmid factor(s) is reported') -parser.add_option('--covera', dest='CoverA', action='store', type='float', metavar='float', +parser.add_option('--covera', dest='CoverA', type='float', metavar='float', help='C over A ratio for hexagonal systems') -parser.add_option('-r','--rank', dest='rank', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-r','--rank', dest='rank', type='int', nargs=3, metavar='int int int', help="report trace of r'th highest Schmid factor [%default]") -parser.add_option('-e', '--eulers', dest='eulers', action='store', type='string', metavar='string', +parser.add_option('-e', '--eulers', dest='eulers', metavar='string', help='Euler angles label') parser.add_option('-d', '--degrees', dest='degrees', action='store_true', help = 'Euler angles are given in degrees [%default]') diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index 78653efb1..caf1c5827 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -19,7 +19,7 @@ Add column(s) containing eigenvalues and eigenvectors of requested tensor column """, version = scriptID) -parser.add_option('-t','--tensor', dest='tensor', action='extend', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing tensor field values') parser.set_defaults(tensor = []) diff --git a/processing/post/addStrainTensors.py b/processing/post/addStrainTensors.py index 463eb69db..6223d4671 100755 --- a/processing/post/addStrainTensors.py +++ b/processing/post/addStrainTensors.py @@ -40,7 +40,7 @@ parser.add_option('-b','-1','--biot', dest='biot', action='store_true', help='calculate biot strain tensor [%default]') parser.add_option('-g','-2','--green', dest='green', action='store_true', help='calculate green strain tensor [%default]') -parser.add_option('-f','--defgrad', dest='defgrad', action='extend', type='string', metavar = '', +parser.add_option('-f','--defgrad', dest='defgrad', action='extend', metavar = '', help='heading(s) of columns containing deformation tensor values %default') parser.set_defaults(right = False) parser.set_defaults(left = False) diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index 535754484..22ed7e8d3 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -18,15 +18,15 @@ Average each data block of size 'packing' into single values thus reducing the f """, version = scriptID) -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-p','--packing', dest='packing', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-p','--packing', dest='packing', type='int', nargs=3, metavar='int int int', help='size of packed group %default') -parser.add_option('--shift', dest='shift', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('--shift', dest='shift', type='int', nargs=3, metavar='int int int', help='shift vector of packing stencil %default') -parser.add_option('-g', '--grid', dest='grid', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-g', '--grid', dest='grid', type='int', nargs=3, metavar='int int int', help='grid in x,y,z [autodetect]') -parser.add_option('-s', '--size', dest='size', action='store', type='float', nargs=3, metavar='float float float', +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(packing = [2,2,2]) diff --git a/processing/post/binXY.py b/processing/post/binXY.py index e1cf90ade..141837438 100755 --- a/processing/post/binXY.py +++ b/processing/post/binXY.py @@ -18,19 +18,19 @@ Produces a binned grid of two columns from an ASCIItable, i.e. a two-dimensional """, version = scriptID) -parser.add_option('-d','--data', dest='data', action='store', nargs=2, type='int', metavar='int int', +parser.add_option('-d','--data', dest='data', nargs=2, type='int', metavar='int int', help='columns containing x and y %default') -parser.add_option('-w','--weight', dest='weight', action='store', metavar='int', +parser.add_option('-w','--weight', dest='weight', metavar='int', help='column containing weight of (x,y) point [%default]') -parser.add_option('-b','--bins', dest='bins', action='store', nargs=2, type='int', metavar='int int', +parser.add_option('-b','--bins', dest='bins', nargs=2, type='int', metavar='int int', help='number of bins in x and y direction %default') -parser.add_option('-t','--type', dest='type', action='store', nargs=3, type='string', metavar='string string string', +parser.add_option('-t','--type', dest='type', nargs=3, metavar='string string string', help='type (linear/log) of x, y, and z axis [linear]') -parser.add_option('-x','--xrange', dest='xrange', action='store', nargs=2, type='float', metavar='float float', +parser.add_option('-x','--xrange', dest='xrange', nargs=2, type='float', metavar='float float', help='value range in x direction [auto]') -parser.add_option('-y','--yrange', dest='yrange', action='store', nargs=2, type='float', metavar='float float', +parser.add_option('-y','--yrange', dest='yrange', nargs=2, type='float', metavar='float float', help='value range in y direction [auto]') -parser.add_option('-z','--zrange', dest='zrange', action='store', nargs=2, type='float', metavar='float float', +parser.add_option('-z','--zrange', dest='zrange', nargs=2, type='float', metavar='float float', help='value range in z direction [auto]') parser.add_option('-i','--invert', dest='invert', action='store_true', help='invert probability density [%default]') diff --git a/processing/post/blowUp.py b/processing/post/blowUp.py index c7688ca3e..93c89acf8 100755 --- a/processing/post/blowUp.py +++ b/processing/post/blowUp.py @@ -19,13 +19,13 @@ to resolution*packing. """, version = scriptID) -parser.add_option('-c','--coordinates', dest='coords', action='store', type='string', metavar='string', +parser.add_option('-c','--coordinates', dest='coords', metavar='string', help='column heading for coordinates [%default]') -parser.add_option('-p','--packing', dest='packing', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-p','--packing', dest='packing', type='int', nargs=3, metavar='int int int', help='dimension of packed group %default') -parser.add_option('-g','--grid', dest='resolution', action='store', type='int', nargs=3, metavar='int int int', +parser.add_option('-g','--grid', dest='resolution', type='int', nargs=3, metavar='int int int', help='resolution in x,y,z [autodetect]') -parser.add_option('-s','--size', dest='dimension', action='store', type='float', nargs=3, metavar='int int int', +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(packing = [2,2,2]) diff --git a/processing/post/deleteColumn.py b/processing/post/deleteColumn.py index 4ae55c3f3..a968cbdaf 100755 --- a/processing/post/deleteColumn.py +++ b/processing/post/deleteColumn.py @@ -17,13 +17,13 @@ Remove column(s) containing scalar, vectorial, and/or tensorial data. """, version = scriptID) -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', metavar='', +parser.add_option('-v','--vector', dest='vector', action='extend', metavar='', help='heading of columns containing 3x1 vector field values') -parser.add_option('-t','--tensor', dest='tensor', action='extend', type='string', metavar='', +parser.add_option('-t','--tensor', dest='tensor', action='extend', metavar='', help='heading of columns containing 3x3 tensor field values') -parser.add_option('-s','--special', dest='special', action='extend', type='string', metavar='', +parser.add_option('-s','--special', dest='special', action='extend', metavar='', help='heading of columns containing field values of special dimension') -parser.add_option('-d','--dimension', dest='N', action='store', type='int', metavar='int', +parser.add_option('-d','--dimension', dest='N', type='int', metavar='int', help='dimension of special field values [%default]') parser.set_defaults(vector = []) diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index 8515e098d..1416a6a75 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -21,11 +21,11 @@ All rows where label 'foo' equals 'bar' -- " #foo# == \"bar\" " """, version = scriptID) -parser.add_option('-w','--white', dest='whitelist', action='extend', type='string', metavar='', +parser.add_option('-w','--white', dest='whitelist', action='extend', metavar='', help='white list of column labels (a,b,c,...)') -parser.add_option('-b','--black', dest='blacklist', action='extend', type='string', metavar='', +parser.add_option('-b','--black', dest='blacklist', action='extend', metavar='', help='black list of column labels (a,b,c,...)') -parser.add_option('-c','--condition', dest='condition', type='string', metavar='string', +parser.add_option('-c','--condition', dest='condition', metavar='string', help='condition to filter rows') parser.set_defaults(whitelist = []) diff --git a/processing/post/marc_extractData.py b/processing/post/marc_extractData.py index 87add0cc8..5be8530ac 100755 --- a/processing/post/marc_extractData.py +++ b/processing/post/marc_extractData.py @@ -305,11 +305,11 @@ parser.add_option('-t','--type', dest='type', type='choice', choices=['ipbased', group_material = OptionGroup(parser,'Material identifier') -group_material.add_option('--homogenization', dest='homog', type='string', \ +group_material.add_option('--homogenization', dest='homog', \ help='homogenization identifier (as string or integer [%default])', metavar='') -group_material.add_option('--crystallite', dest='cryst', type='string', \ +group_material.add_option('--crystallite', dest='cryst', \ help='crystallite identifier (as string or integer [%default])', metavar='') -group_material.add_option('--phase', dest='phase', type='string', \ +group_material.add_option('--phase', dest='phase', \ help='phase identifier (as string or integer [%default])', metavar='') parser.add_option_group(group_material) diff --git a/processing/post/postResults.py b/processing/post/postResults.py index 4ae8d3c47..73056c171 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -682,44 +682,44 @@ parser.add_option('-r','--range', dest='range', type='int', nargs=3, \ help='range of positions (or increments) to output (start, end, step) [all]') parser.add_option('--increments', action='store_true', dest='getIncrements', \ help='switch to increment range [%default]') -parser.add_option('-m','--map', dest='func', type='string', \ +parser.add_option('-m','--map', dest='func', \ help='data reduction mapping ["%default"] out of min, max, avg, avgabs, sum, sumabs or user-lambda') -parser.add_option('-p','--type', dest='filetype', type='string', \ +parser.add_option('-p','--type', dest='filetype', \ help = 'type of result file [auto]') group_material = OptionGroup(parser,'Material identifier') -group_material.add_option('--homogenization', dest='homog', type='string', \ +group_material.add_option('--homogenization', dest='homog', \ help='homogenization identifier (as string or integer [%default])', metavar='') -group_material.add_option('--crystallite', dest='cryst', type='string', \ +group_material.add_option('--crystallite', dest='cryst', \ help='crystallite identifier (as string or integer [%default])', metavar='') -group_material.add_option('--phase', dest='phase', type='string', \ +group_material.add_option('--phase', dest='phase', \ help='phase identifier (as string or integer [%default])', metavar='') group_special = OptionGroup(parser,'Special outputs') group_special.add_option('-t','--time', action='store_true', dest='time', \ help='output time of increment [%default]') -group_special.add_option('-f','--filter', dest='filter', type='string', \ +group_special.add_option('-f','--filter', dest='filter', \ help='condition(s) to filter results [%default]', metavar='') -group_special.add_option('--separation', action='extend', dest='sep', type='string', \ +group_special.add_option('--separation', action='extend', dest='sep', \ help='properties to separate results [%default]', metavar='') -group_special.add_option('--sort', action='extend', dest='sort', type='string', \ +group_special.add_option('--sort', action='extend', dest='sort', \ help='properties to sort results [%default]', metavar='') group_general = OptionGroup(parser,'General outputs') -group_general.add_option('--ns', action='extend', dest='nodalScalar', type='string', \ +group_general.add_option('--ns', action='extend', dest='nodalScalar', \ help='nodal scalars to extract', metavar='') -group_general.add_option('--es', action='extend', dest='elemScalar', type='string', \ +group_general.add_option('--es', action='extend', dest='elemScalar', \ help='elemental scalars to extract', metavar='') -group_general.add_option('--et', action='extend', dest='elemTensor', type='string', \ +group_general.add_option('--et', action='extend', dest='elemTensor', \ help='elemental tensors to extract', metavar='') -group_general.add_option('--ho', action='extend', dest='homogenizationResult', type='string', \ +group_general.add_option('--ho', action='extend', dest='homogenizationResult', \ help='homogenization results to extract', metavar='') -group_general.add_option('--cr', action='extend', dest='crystalliteResult', type='string', \ +group_general.add_option('--cr', action='extend', dest='crystalliteResult', \ help='crystallite results to extract', metavar='') -group_general.add_option('--co', action='extend', dest='constitutiveResult', type='string', \ +group_general.add_option('--co', action='extend', dest='constitutiveResult', \ help='constitutive results to extract', metavar='') parser.add_option_group(group_material) diff --git a/processing/post/scaleData.py b/processing/post/scaleData.py index 69931865e..fbc10352c 100755 --- a/processing/post/scaleData.py +++ b/processing/post/scaleData.py @@ -19,7 +19,7 @@ Uniformly scale values scalar/special, vector, or tensor columns by given factor """, version = scriptID) -parser.add_option('-s','--special', dest='special', action='extend', type='string', metavar='', +parser.add_option('-s','--special', dest='special', action='extend', metavar='', help='heading of columns containing field values of special dimension') parser.add_option('-d','--dimension',dest='N', type='int', metavar='int', help='dimension of special field values [%default]') diff --git a/processing/post/shiftData.py b/processing/post/shiftData.py index 61fb46d54..66b2e1f4e 100755 --- a/processing/post/shiftData.py +++ b/processing/post/shiftData.py @@ -19,7 +19,7 @@ Shift values of scalar/special, vector, or tensor columns by given offset. """, version = scriptID) -parser.add_option('-s','--special', dest='special', action='extend', type='string', metavar='', +parser.add_option('-s','--special', dest='special', action='extend', metavar='', help='heading of columns containing field values of special dimension') parser.add_option('-d','--dimension',dest='N', type='int', metavar='int', help='dimension of special field values [%default]') diff --git a/processing/post/sortTable.py b/processing/post/sortTable.py index e157fc5e0..3f2762e2f 100755 --- a/processing/post/sortTable.py +++ b/processing/post/sortTable.py @@ -40,7 +40,7 @@ With coordinates in columns "x", "y", and "z"; sorting with x slowest and z fast ) -parser.add_option('-l','--label', dest='keys', action='extend', type='string', metavar='', +parser.add_option('-l','--label', dest='keys', action='extend', metavar='', help='list of column labels (a,b,c,...)') parser.add_option('-r','--reverse', dest='reverse', action='store_true', help='reverse sorting') diff --git a/processing/post/tagLabel.py b/processing/post/tagLabel.py index cffef4c42..508863974 100755 --- a/processing/post/tagLabel.py +++ b/processing/post/tagLabel.py @@ -34,15 +34,15 @@ Tag scalar, vectorial, and/or tensorial data header labels by specified suffix. """ + string.replace('$Id$','\n','\\n') ) -parser.add_option('-l','--tag', dest='tag', type='string', \ +parser.add_option('-l','--tag', dest='tag', \ help='tag to use as suffix for labels') -parser.add_option('-v','--vector', dest='vector', action='extend', type='string', \ +parser.add_option('-v','--vector', dest='vector', action='extend', \ help='heading of columns containing 3x1 vector field values') -parser.add_option('-t','--tensor', dest='tensor', action='extend', type='string', \ +parser.add_option('-t','--tensor', dest='tensor', action='extend', \ help='heading of columns containing 3x3 tensor field values') -parser.add_option('-s','--special', dest='special', action='extend', type='string', \ +parser.add_option('-s','--special', dest='special', action='extend', \ help='heading of columns containing field values of special dimension') -parser.add_option('-d','--dimension', dest='N', action='store', type='int', \ +parser.add_option('-d','--dimension', dest='N', type='int', \ help='dimension of special field values [%default]') parser.set_defaults(tag = '') diff --git a/processing/post/vtk2ang.py b/processing/post/vtk2ang.py index b9571f4af..c991d1baa 100755 --- a/processing/post/vtk2ang.py +++ b/processing/post/vtk2ang.py @@ -83,9 +83,9 @@ Builds a ang files from a vtk file. ) -parser.add_option('--disp','--displacement',dest='dispLabel', type='string', \ +parser.add_option('--disp','--displacement',dest='dispLabel', \ help='label of displacements [%default]') -parser.add_option('--euler', dest='eulerLabel', type='string', nargs=3, \ +parser.add_option('--euler', dest='eulerLabel', nargs=3, \ help='labels of euler angles [%default]') parser.add_option('-n','--normal', dest='normal', type='float', nargs=3, \ help='normal of slices in direction of increasing slice numbers [%default]') diff --git a/processing/post/vtk_addPointcloudData.py b/processing/post/vtk_addPointcloudData.py index d6b34a2c5..835d4292e 100755 --- a/processing/post/vtk_addPointcloudData.py +++ b/processing/post/vtk_addPointcloudData.py @@ -32,7 +32,7 @@ Add scalar and RGB tuples from ASCIItable to existing VTK point cloud (.vtp). """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-v', '--vtk', dest='vtk', type='string', \ +parser.add_option('-v', '--vtk', dest='vtk', \ help = 'VTK file name') parser.add_option('-s', '--scalar', dest='scalar', action='extend', \ help = 'scalar values') diff --git a/processing/post/vtk_addVoxelcloudData.py b/processing/post/vtk_addVoxelcloudData.py index 56dbbecfb..053353227 100755 --- a/processing/post/vtk_addVoxelcloudData.py +++ b/processing/post/vtk_addVoxelcloudData.py @@ -32,7 +32,7 @@ Add scalar and RGB tuples from ASCIItable to existing VTK voxel cloud (.vtu). """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-v', '--vtk', dest='vtk', type='string', \ +parser.add_option('-v', '--vtk', dest='vtk', \ help = 'VTK file name') parser.add_option('-s', '--scalar', dest='scalar', action='extend', \ help = 'scalar values') diff --git a/processing/post/vtk_pointcloud.py b/processing/post/vtk_pointcloud.py index 8ddd5e6e9..0b4c2f2ec 100755 --- a/processing/post/vtk_pointcloud.py +++ b/processing/post/vtk_pointcloud.py @@ -32,7 +32,7 @@ Add grain index based on similitude of crystal lattice orientation. """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-p', '--positions', dest='pos', type='string', \ +parser.add_option('-p', '--positions', dest='pos', \ help = 'coordinate label') parser.set_defaults(pos = 'pos') diff --git a/processing/post/vtk_scalars2vectors.py b/processing/post/vtk_scalars2vectors.py index 8c9d6e5cf..266b5066b 100755 --- a/processing/post/vtk_scalars2vectors.py +++ b/processing/post/vtk_scalars2vectors.py @@ -16,9 +16,9 @@ parser = OptionParser(usage='%prog [options] vtkfile', description = """ """ + string.replace('$Id$','\n','\\n') ) -parser.add_option('-v','--vector', nargs=3, dest='vector', type='string', \ +parser.add_option('-v','--vector', nargs=3, dest='vector', \ help='suffices indicating vector components [%default]') -parser.add_option('-s','--separator', dest='separator', type='string', \ +parser.add_option('-s','--separator', dest='separator', \ help='separator between label and suffix [%default]') parser.set_defaults(vector = ['x','y','z']) diff --git a/processing/pre/OIMang_hex2cub.py b/processing/pre/OIMang_hex2cub.py index f10a12595..ff1d05c51 100755 --- a/processing/pre/OIMang_hex2cub.py +++ b/processing/pre/OIMang_hex2cub.py @@ -34,7 +34,7 @@ Converts ang files (EBSD Data) from hexagonal grid to a pixel grid """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-x', dest='columnX', action='store', type='int', metavar='int', \ +parser.add_option('-x', dest='columnX', type='int', metavar='int', \ help='column containing x coordinates [%default]') parser.set_defaults(columnX = 3) diff --git a/processing/pre/abq_addUserOutput.py b/processing/pre/abq_addUserOutput.py index b6f751bfa..4bb32b40a 100755 --- a/processing/pre/abq_addUserOutput.py +++ b/processing/pre/abq_addUserOutput.py @@ -74,17 +74,17 @@ Or have an existing set of user variables copied over from another *.inp file. parser.add_option('-n','--number', dest='number', type='int', \ help='maximum requested User Defined Variable [%default]') -parser.add_option('--homogenization', dest='homog', type='string', \ +parser.add_option('--homogenization', dest='homog', \ help='homogenization identifier (as string or integer [%default])') -parser.add_option('--crystallite', dest='cryst', type='string', \ +parser.add_option('--crystallite', dest='cryst', \ help='crystallite identifier (as string or integer [%default])') -parser.add_option('--phase', dest='phase', type='string', \ +parser.add_option('--phase', dest='phase', \ help='phase identifier (as string or integer [%default])') -parser.add_option('--use', dest='useFile', type='string', \ +parser.add_option('--use', dest='useFile', \ help='Optionally parse output descriptors from '+ 'different .outputZZZ file. Saves the effort '+ 'to start a calculation for each job [%default])') -parser.add_option('--option', dest='damaskOption', type='string', \ +parser.add_option('--option', dest='damaskOption', \ help='Add damask option to input file '+ 'for example: "periodic x z" [%default]') parser.set_defaults(number = 0) diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 8c3278b12..f2d8cc3b2 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -62,7 +62,7 @@ parser.add_option('-f', '--fill', dest='fill', type='int', metavar = 'int' help='grain index to fill primitive. "0" selects maximum microstructure index + 1 [%default]') parser.add_option('-q', '--quaternion', dest='quaternion', type='float', nargs = 4, metavar=' '.join(['float']*4), help = 'rotation of primitive as quaternion') -parser.add_option('-a', '--angleaxis', dest='angleaxis', type='string', nargs = 4, metavar=' '.join(['float']*4), +parser.add_option('-a', '--angleaxis', dest='angleaxis', nargs = 4, metavar=' '.join(['float']*4), help = 'rotation of primitive as angle and axis') parser.add_option( '--degrees', dest='degrees', action='store_true', help = 'angle is given in degrees [%default]') diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index c2806e5a8..f5954e5e2 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -52,7 +52,7 @@ Changes the (three-dimensional) canvas of a spectral geometry description. """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-g', '--grid', dest='grid', type='string', nargs = 3, metavar='int int int ', \ +parser.add_option('-g', '--grid', dest='grid', nargs = 3, metavar='int int int ', \ help='a,b,c grid of hexahedral box [unchanged]') parser.add_option('-o', '--offset', dest='offset', type='int', nargs = 3, metavar='int int int', \ help='a,b,c offset from old to new origin of grid %default') diff --git a/processing/pre/geom_fromAng.py b/processing/pre/geom_fromAng.py index de83c5870..1e9ef1ae9 100755 --- a/processing/pre/geom_fromAng.py +++ b/processing/pre/geom_fromAng.py @@ -49,7 +49,7 @@ parser.add_option('-c', '--configuration', dest='config', action='store_true', \ help='output material configuration [%default]') parser.add_option('--compress', dest='compress', action='store_true', \ help='search for matching mircrostructure and texture and lump them [%default]') -parser.add_option('-a', '--axes', dest='axes', type='string', nargs = 3, metavar = 'string string string', \ +parser.add_option('-a', '--axes', dest='axes', nargs = 3, metavar = 'string string string', \ help='axes assignement of eulerangles x,y,z = %default') diff --git a/processing/pre/geom_grainGrowth.py b/processing/pre/geom_grainGrowth.py index 57c5131b0..c2acc6e17 100755 --- a/processing/pre/geom_grainGrowth.py +++ b/processing/pre/geom_grainGrowth.py @@ -45,7 +45,7 @@ parser.add_option('-N', '--smooth', dest='N', type='int', metavar='int', help='N for curvature flow [%default]') parser.add_option('-r', '--renumber', dest='renumber', action='store_true', help='renumber microstructure indices from 1...N [%default]') -parser.add_option('-i', '--immutable', action='extend', dest='immutable', type='string', metavar = '', +parser.add_option('-i', '--immutable', action='extend', dest='immutable', metavar = '', help='list of immutable microstructures') parser.set_defaults(d = 1) diff --git a/processing/pre/geom_rescale.py b/processing/pre/geom_rescale.py index 0399efeae..9c7c7bb3e 100755 --- a/processing/pre/geom_rescale.py +++ b/processing/pre/geom_rescale.py @@ -53,9 +53,9 @@ Either absolute values or relative factors (like "0.25x") can be used. """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option('-g', '--grid', dest='grid', type='string', nargs = 3, metavar = 'string string string', \ +parser.add_option('-g', '--grid', dest='grid', nargs = 3, metavar = 'string string string', \ help='a,b,c grid of hexahedral box [unchanged]') -parser.add_option('-s', '--size', dest='size', type='string', nargs = 3, metavar = 'string string string', \ +parser.add_option('-s', '--size', dest='size', nargs = 3, metavar = 'string string string', \ help='x,y,z size of hexahedral box [unchanged]') parser.add_option('-r', '--renumber', dest='renumber', action='store_true', \ help='renumber microstructure indices from 1...N [%default]') diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index e8f477a2d..560000470 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -55,7 +55,7 @@ parser.add_option('-o', '--origin', dest='origin', type='float', nargs = 3, \ help='offset from old to new origin of grid', metavar='float float float') parser.add_option('-m', '--microstructure', dest='microstructure', type='int', \ help='offset from old to new microstructure indices', metavar='int') -parser.add_option('-s', '--substitute', action='extend', dest='substitute', type='string', \ +parser.add_option('-s', '--substitute', action='extend', dest='substitute', \ help='substitutions of microstructure indices from,to,from,to,...', metavar='') parser.set_defaults(origin = [0.0,0.0,0.0]) diff --git a/processing/pre/marc_addUserOutput.py b/processing/pre/marc_addUserOutput.py index 8145a828a..baba9a149 100755 --- a/processing/pre/marc_addUserOutput.py +++ b/processing/pre/marc_addUserOutput.py @@ -68,17 +68,17 @@ Or have an existing set of user variables copied over from another *.dat file. """) parser.add_option('-n','--number', dest='number', type='int', \ help='maximum requested User Defined Variable [%default]') -parser.add_option('--homogenization', dest='homog', type='string', \ +parser.add_option('--homogenization', dest='homog', \ help='homogenization identifier (as string or integer [%default])') -parser.add_option('--crystallite', dest='cryst', type='string', \ +parser.add_option('--crystallite', dest='cryst', \ help='crystallite identifier (as string or integer [%default])') -parser.add_option('--phase', dest='phase', type='string', \ +parser.add_option('--phase', dest='phase', \ help='phase identifier (as string or integer [%default])') -parser.add_option('--use', dest='useFile', type='string', \ +parser.add_option('--use', dest='useFile', \ help='Optionally parse output descriptors from '+ 'different .outputZZZ file. Saves the effort '+ 'to start a calculation for each job [%default])') -parser.add_option('--option', dest='damaskOption', type='string', \ +parser.add_option('--option', dest='damaskOption', \ help='Add damask option to input file '+ 'for example: "periodic x z" [%default]') parser.set_defaults(number = 0) diff --git a/processing/pre/patchFromReconstructedBoundaries.py b/processing/pre/patchFromReconstructedBoundaries.py index 4ca1a42cb..02ab0f96f 100755 --- a/processing/pre/patchFromReconstructedBoundaries.py +++ b/processing/pre/patchFromReconstructedBoundaries.py @@ -807,7 +807,7 @@ reconstructed boundary file """ + string.replace(scriptID,'\n','\\n') ) -parser.add_option("-o", "--output", action='extend', dest='output', type='string', \ +parser.add_option("-o", "--output", action='extend', dest='output', \ help="types of output [image, mentat, procedure, spectral]") parser.add_option("-p", "--port", type="int",\ dest="port",\ diff --git a/processing/pre/seeds_fromGeom.py b/processing/pre/seeds_fromGeom.py index 0cc7d50bb..7c865c046 100755 --- a/processing/pre/seeds_fromGeom.py +++ b/processing/pre/seeds_fromGeom.py @@ -56,9 +56,9 @@ Examples: ) -parser.add_option('-w','--white', dest='whitelist', action='extend', type='string', \ +parser.add_option('-w','--white', dest='whitelist', action='extend', \ help='white list of grain IDs', metavar='') -parser.add_option('-b','--black', dest='blacklist', action='extend', type='string', \ +parser.add_option('-b','--black', dest='blacklist', action='extend', \ help='black list of grain IDs', metavar='') parser.set_defaults(whitelist = [])