From 0571ca4d66e23cc32132b496369212d0233177ae Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 18 Jul 2016 16:45:06 +0200 Subject: [PATCH 1/5] updated version information after successful test of v2.0.0-385-g1b30b18 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e7c04b3f7..9b8617d3b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-350-g7d84b99 +v2.0.0-385-g1b30b18 From 0a2d5e4c2a0d2bd41101be2375632cf1e20c92c5 Mon Sep 17 00:00:00 2001 From: zhangc43 Date: Mon, 18 Jul 2016 12:29:12 -0400 Subject: [PATCH 2/5] add missing newline to header for postResult --- processing/post/postResults.py | 174 ++++++++++++++++----------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/processing/post/postResults.py b/processing/post/postResults.py index c81f561d5..e01a27044 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -18,7 +18,7 @@ fileExtensions = { \ # ----------------------------- class vector: # mimic py_post node object x,y,z = [None,None,None] - + def __init__(self,coords): self.x = coords[0] self.y = coords[1] @@ -102,7 +102,7 @@ class MPIEspectral_result: # mimic py_post result object self._frequencies = self._keyedPackedArray('frequencies:',count=self.N_loadcases,type='i') if all ( i is None for i in self._frequencies): self._frequencies = self._keyedPackedArray('frequencies',count=self.N_loadcases,type='i') - + self._increments = self._keyedPackedArray('increments:',count=self.N_loadcases,type='i') if all (i is None for i in self._increments): self._increments = self._keyedPackedArray('increments',count=self.N_loadcases,type='i') @@ -111,7 +111,7 @@ class MPIEspectral_result: # mimic py_post result object if self.startingIncrement is None: self.startingIncrement = self._keyedPackedArray('startingIncrement',count=1,type='i')[0] - + self._times = self._keyedPackedArray('times:',count=self.N_loadcases,type='d') if all (i is None for i in self._times): self._times = self._keyedPackedArray('times',count=self.N_loadcases,type='d') @@ -119,15 +119,15 @@ class MPIEspectral_result: # mimic py_post result object self._logscales = self._keyedPackedArray('logscales:',count=self.N_loadcases,type='i') if all (i is None for i in self._logscales): self._logscales = self._keyedPackedArray('logscales',count=self.N_loadcases,type='i') - + self.size = self._keyedPackedArray('size:',count=3,type='d') if self.size == [None,None,None]: # no 'size' found, try legacy alias 'dimension' self.size = self._keyedPackedArray('dimension',count=3,type='d') - + self.grid = self._keyedPackedArray('grid:',count=3,type='i') if self.grid == [None,None,None]: # no 'grid' found, try legacy alias 'resolution' self.grid = self._keyedPackedArray('resolution',count=3,type='i') - + self.N_nodes = (self.grid[0]+1)*(self.grid[1]+1)*(self.grid[2]+1) self.N_elements = self.grid[0] * self.grid[1] * self.grid[2] @@ -139,7 +139,7 @@ class MPIEspectral_result: # mimic py_post result object self.N_increments = 1 # add zero'th entry for i in range(self.N_loadcases): self.N_increments += self._increments[i]//self._frequencies[i] - + # parameters for file handling depending on output format if options.legacy: @@ -176,17 +176,17 @@ class MPIEspectral_result: # mimic py_post result object name = '' filepos=0 # start at the beginning while name != identifier and filepos < self.dataOffset: # stop searching when found or when reached end of header - self.file.seek(filepos) + self.file.seek(filepos) # read the starting tag in front of the keyword (Fortran indicates start and end of writing by a 4 byte tag indicating the length of the following data) dataLen=struct.unpack('i',self.file.read(4))[0] name = self.file.read(len(identifier)) # anticipate identifier - start=filepos+(4+len(identifier)) # position of the values for the found key + start=filepos+(4+len(identifier)) # position of the values for the found key filepos=filepos+(4+dataLen+4) # forward to next keyword - + if name==identifier: # found the correct name key['pos'] = start # save position key['name'] = name - return key + return key def _keyedPackedArray(self,identifier,count = 3,type = 'd',default = None): bytecount = {'d': 8,'i': 4} @@ -251,10 +251,10 @@ class MPIEspectral_result: # mimic py_post result object def element_sequence(self,e): return e-1 - + def element_id(self,e): return e+1 - + def element(self,e): a = self.grid[0]+1 b = self.grid[1]+1 @@ -291,7 +291,7 @@ class MPIEspectral_result: # mimic py_post result object print 'seeking',incStart+where print 'e',e,'idx',idx sys.exit(1) - + else: self.fourByteLimit = 2**31 -1 -8 # header & footer + extra header and footer for 4 byte int range (Fortran) @@ -309,7 +309,7 @@ class MPIEspectral_result: # mimic py_post result object data += self.file.read(1) where += 1 value = struct.unpack('d',data)[0] - else: + else: self.file.seek(incStart+where+(where//self.fourByteLimit)*8+4) value = struct.unpack('d',self.file.read(8))[0] except: @@ -328,39 +328,39 @@ class MPIEspectral_result: # mimic py_post result object # ----------------------------- def ipCoords(elemType, nodalCoordinates): """returns IP coordinates for a given element""" - nodeWeightsPerNode = { - 7: [ [27.0, 9.0, 3.0, 9.0, 9.0, 3.0, 1.0, 3.0], - [ 9.0, 27.0, 9.0, 3.0, 3.0, 9.0, 3.0, 1.0], - [ 3.0, 9.0, 27.0, 9.0, 1.0, 3.0, 9.0, 3.0], - [ 9.0, 3.0, 9.0, 27.0, 3.0, 1.0, 3.0, 9.0], - [ 9.0, 3.0, 1.0, 3.0, 27.0, 9.0, 3.0, 9.0], - [ 3.0, 9.0, 3.0, 1.0, 9.0, 27.0, 9.0, 3.0], - [ 1.0, 3.0, 9.0, 3.0, 3.0, 9.0, 27.0, 9.0], - [ 3.0, 1.0, 3.0, 9.0, 9.0, 3.0, 9.0, 27.0] ], - 57: [ [27.0, 9.0, 3.0, 9.0, 9.0, 3.0, 1.0, 3.0], - [ 9.0, 27.0, 9.0, 3.0, 3.0, 9.0, 3.0, 1.0], - [ 3.0, 9.0, 27.0, 9.0, 1.0, 3.0, 9.0, 3.0], - [ 9.0, 3.0, 9.0, 27.0, 3.0, 1.0, 3.0, 9.0], - [ 9.0, 3.0, 1.0, 3.0, 27.0, 9.0, 3.0, 9.0], - [ 3.0, 9.0, 3.0, 1.0, 9.0, 27.0, 9.0, 3.0], - [ 1.0, 3.0, 9.0, 3.0, 3.0, 9.0, 27.0, 9.0], - [ 3.0, 1.0, 3.0, 9.0, 9.0, 3.0, 9.0, 27.0] ], - 117: [ [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] ], + nodeWeightsPerNode = { + 7: [ [27.0, 9.0, 3.0, 9.0, 9.0, 3.0, 1.0, 3.0], + [ 9.0, 27.0, 9.0, 3.0, 3.0, 9.0, 3.0, 1.0], + [ 3.0, 9.0, 27.0, 9.0, 1.0, 3.0, 9.0, 3.0], + [ 9.0, 3.0, 9.0, 27.0, 3.0, 1.0, 3.0, 9.0], + [ 9.0, 3.0, 1.0, 3.0, 27.0, 9.0, 3.0, 9.0], + [ 3.0, 9.0, 3.0, 1.0, 9.0, 27.0, 9.0, 3.0], + [ 1.0, 3.0, 9.0, 3.0, 3.0, 9.0, 27.0, 9.0], + [ 3.0, 1.0, 3.0, 9.0, 9.0, 3.0, 9.0, 27.0] ], + 57: [ [27.0, 9.0, 3.0, 9.0, 9.0, 3.0, 1.0, 3.0], + [ 9.0, 27.0, 9.0, 3.0, 3.0, 9.0, 3.0, 1.0], + [ 3.0, 9.0, 27.0, 9.0, 1.0, 3.0, 9.0, 3.0], + [ 9.0, 3.0, 9.0, 27.0, 3.0, 1.0, 3.0, 9.0], + [ 9.0, 3.0, 1.0, 3.0, 27.0, 9.0, 3.0, 9.0], + [ 3.0, 9.0, 3.0, 1.0, 9.0, 27.0, 9.0, 3.0], + [ 1.0, 3.0, 9.0, 3.0, 3.0, 9.0, 27.0, 9.0], + [ 3.0, 1.0, 3.0, 9.0, 9.0, 3.0, 9.0, 27.0] ], + 117: [ [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] ], 125: [ [ 3.0, 0.0, 0.0, 4.0, 1.0, 4.0], [ 0.0, 3.0, 0.0, 4.0, 4.0, 1.0], - [ 0.0, 0.0, 3.0, 1.0, 4.0, 4.0],], + [ 0.0, 0.0, 3.0, 1.0, 4.0, 4.0],], 127: [ [ 45.0, 17.0, 17.0, 17.0], [ 17.0, 45.0, 17.0, 17.0], [ 17.0, 17.0, 45.0, 17.0], - [ 17.0, 17.0, 17.0, 45.0],], - 136: [ [42.0, 15.0, 15.0, 14.0, 5.0, 5.0], - [15.0, 42.0, 15.0, 5.0, 14.0, 5.0], - [15.0, 15.0, 42.0, 5.0, 5.0, 14.0], - [14.0, 5.0, 5.0, 42.0, 15.0, 15.0], - [ 5.0, 14.0, 5.0, 15.0, 42.0, 15.0], - [ 5.0, 5.0, 14.0, 15.0, 15.0, 42.0] ], + [ 17.0, 17.0, 17.0, 45.0],], + 136: [ [42.0, 15.0, 15.0, 14.0, 5.0, 5.0], + [15.0, 42.0, 15.0, 5.0, 14.0, 5.0], + [15.0, 15.0, 42.0, 5.0, 5.0, 14.0], + [14.0, 5.0, 5.0, 42.0, 15.0, 15.0], + [ 5.0, 14.0, 5.0, 15.0, 42.0, 15.0], + [ 5.0, 5.0, 14.0, 15.0, 15.0, 42.0] ], } - + Nips = len(nodeWeightsPerNode[elemType]) ipCoordinates = [[0.0,0.0,0.0] for i in range(Nips)] for ip in range(Nips): @@ -369,7 +369,7 @@ def ipCoords(elemType, nodalCoordinates): ipCoordinates[ip][i] += nodeWeightsPerNode[elemType][ip][node] * nodalCoordinates[node][i] for i in range(3): ipCoordinates[ip][i] /= sum(nodeWeightsPerNode[elemType][ip]) - + return ipCoordinates @@ -377,15 +377,15 @@ def ipCoords(elemType, nodalCoordinates): # ----------------------------- def ipIDs(elemType): """returns IP numbers for given element type""" - ipPerNode = { - 7: [ 1, 2, 4, 3, 5, 6, 8, 7 ], - 57: [ 1, 2, 4, 3, 5, 6, 8, 7 ], + ipPerNode = { + 7: [ 1, 2, 4, 3, 5, 6, 8, 7 ], + 57: [ 1, 2, 4, 3, 5, 6, 8, 7 ], 117: [ 1 ], - 125: [ 1, 2, 3 ], - 127: [ 1, 2, 3, 4 ], - 136: [ 1, 2, 3, 4, 5, 6 ], + 125: [ 1, 2, 3 ], + 127: [ 1, 2, 3, 4 ], + 136: [ 1, 2, 3, 4, 5, 6 ], } - + return ipPerNode[elemType] @@ -457,7 +457,7 @@ def OpenPostfile(name,type,nodal = False): }[type](name) p.extrapolation({True:'linear',False:'translate'}[nodal]) p.moveto(1) - + return p @@ -475,9 +475,9 @@ def ParseOutputFormat(filename,what,me): break except: pass - + if content == []: return format # nothing found... - + tag = '' tagID = 0 for line in content: @@ -527,7 +527,7 @@ def ParsePostfile(p,filename, outputFormat): 'LabelOfElementalTensor': [None]*p.element_tensors(), \ } -# --- find labels +# --- find labels for labelIndex in range(stat['NumberOfNodalScalars']): label = p.node_scalar_label(labelIndex) @@ -543,17 +543,17 @@ def ParsePostfile(p,filename, outputFormat): label = p.element_tensor_label(labelIndex) stat['IndexOfLabel'][label] = labelIndex stat['LabelOfElementalTensor'][labelIndex] = label - + if 'User Defined Variable 1' in stat['IndexOfLabel']: # output format without dedicated names? stat['IndexOfLabel']['HomogenizationCount'] = stat['IndexOfLabel']['User Defined Variable 1'] # adjust first named entry - + if 'HomogenizationCount' in stat['IndexOfLabel']: # does the result file contain relevant user defined output at all? startIndex = stat['IndexOfLabel']['HomogenizationCount'] stat['LabelOfElementalScalar'][startIndex] = 'HomogenizationCount' - + # We now have to find a mapping for each output label as defined in the .output* files to the output position in the post file # Since we know where the user defined outputs start ("startIndex"), we can simply assign increasing indices to the labels -# given in the .output* file +# given in the .output* file offset = 1 for (name,N) in outputFormat['Homogenization']['outputs']: @@ -595,7 +595,7 @@ def ParsePostfile(p,filename, outputFormat): print 'trying to assign %s at position %i+%i'%(label,startIndex,offset) sys.exit(1) offset += 1 - + return stat @@ -614,7 +614,7 @@ def SummarizePostfile(stat,where=sys.stdout,format='marc'): + '\n '.join(stat['LabelOfElementalScalar']) + '\n\n') where.write('elemental tensors:\t%i'%stat['NumberOfElementalTensors'] + '\n\n '\ + '\n '.join(stat['LabelOfElementalTensor']) + '\n\n') - + return True @@ -625,9 +625,9 @@ def SummarizePostfile(stat,where=sys.stdout,format='marc'): # --- input parsing parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """ -Extract data from a .t16 (MSC.Marc) or .spectralOut results file. +Extract data from a .t16 (MSC.Marc) or .spectralOut results file. -List of output variables is given by options '--ns','--es','--et','--ho','--cr','--co'. +List of output variables is given by options '--ns','--es','--et','--ho','--cr','--co'. Filters and separations use 'elem','node','ip','grain', and 'x','y','z' as key words. Example: @@ -751,12 +751,12 @@ if options.filetype is None: if ext in fileExtensions[theType]: options.filetype = theType break - + if options.filetype is not None: options.filetype = options.filetype.lower() if options.filetype == 'marc': offset_pos = 1 else: offset_pos = 0 - + # --- more sanity checks @@ -766,7 +766,7 @@ if options.filetype not in ['marc','spectral']: if options.filetype == 'marc': sys.path.append(damask.solver.Marc().libraryPath()) - + try: from py_post import post_open except: @@ -810,7 +810,7 @@ else: extension = os.path.splitext(files[0])[1] outputFormat = {} -me = { +me = { 'Homogenization': options.homog, 'Crystallite': options.cryst, 'Constitutive': options.phase, @@ -823,7 +823,7 @@ for what in me: if '_id' not in outputFormat[what]['specials']: print "\nsection '%s' not found in <%s>"%(me[what], what) print '\n'.join(map(lambda x:' [%s]'%x, outputFormat[what]['specials']['brothers'])) - + bg.set_message('opening result file...') p = OpenPostfile(filename+extension,options.filetype,options.nodal) bg.set_message('parsing result file...') @@ -834,7 +834,7 @@ if options.filetype == 'marc': # --- sanity check for output variables # for mentat variables (nodalScalar,elemScalar,elemTensor) we simply have to check whether the label # is found in the stat[indexOfLabel] dictionary for user defined variables (homogenizationResult, -# crystalliteResult,constitutiveResult) we have to check the corresponding outputFormat, since the +# crystalliteResult,constitutiveResult) we have to check the corresponding outputFormat, since the # namescheme in stat['IndexOfLabel'] is different for opt in ['nodalScalar','elemScalar','elemTensor','homogenizationResult','crystalliteResult','constitutiveResult']: @@ -856,13 +856,13 @@ if options.info: print '\n\n',p SummarizePostfile(stat) - + print '\nUser Defined Outputs' for what in me: print '\n ',what,':' for output in outputFormat[what]['outputs']: print ' ',output - + sys.exit(0) @@ -900,12 +900,12 @@ if options.nodalScalar: myElemID = 0 myIpID = 0 myGrainID = 0 - + # generate an expression that is only true for the locations specified by options.filter filter = substituteLocation(options.filter, [myElemID,myNodeID,myIpID,myGrainID], myNodeCoordinates) if filter != '' and not eval(filter): # for all filter expressions that are not true:... continue # ... ignore this data point and continue with next - + # --- group data locations # generate a unique key for a group of separated data based on the separation criterium for the location grp = substituteLocation('#'.join(options.sep), [myElemID,myNodeID,myIpID,myGrainID], myNodeCoordinates) @@ -925,7 +925,7 @@ if options.nodalScalar: myNodeCoordinates) # incrementally update average location groups[index[grp]].append([myElemID,myNodeID,myIpID,myGrainID,0]) # append a new list defining each group member memberCount += 1 - + else: for e in xrange(stat['NumberOfElements']): if e%1000 == 0: @@ -943,22 +943,22 @@ else: and int(p.element_scalar(e, stat['IndexOfLabel']['GrainCount'])[0].value))\ or 1): myGrainID = g + 1 - + # --- filter valid locations # generates an expression that is only true for the locations specified by options.filter - filter = substituteLocation(options.filter, [myElemID,myNodeID,myIpID,myGrainID], myIpCoordinates[n]) + filter = substituteLocation(options.filter, [myElemID,myNodeID,myIpID,myGrainID], myIpCoordinates[n]) if filter != '' and not eval(filter): # for all filter expressions that are not true:... continue # ... ignore this data point and continue with next - + # --- group data locations # generates a unique key for a group of separated data based on the separation criterium for the location - grp = substituteLocation('#'.join(options.sep), [myElemID,myNodeID,myIpID,myGrainID], myIpCoordinates[n]) - + grp = substituteLocation('#'.join(options.sep), [myElemID,myNodeID,myIpID,myGrainID], myIpCoordinates[n]) + if grp not in index: # create a new group if not yet present index[grp] = groupCount groups.append([[0,0,0,0,0.0,0.0,0.0]]) # initialize with avg location groupCount += 1 - + groups[index[grp]][0][:4] = mapIncremental('','unique', len(groups[index[grp]])-1, groups[index[grp]][0][:4], @@ -1055,12 +1055,12 @@ for incCount,position in enumerate(locations): # walk through locations +'"%(dirname + os.sep + options.prefix + os.path.split(filename)[1],increments[incCount],options.suffix)') else: outFilename = '%s.txt'%(dirname + os.sep + options.prefix + os.path.split(filename)[1] + options.suffix) - + if not fileOpen: file = open(outFilename,'w') fileOpen = True file.write('2\theader\n') - file.write(scriptID + '\t' + ' '.join(sys.argv[1:])) + file.write(scriptID + '\t' + ' '.join(sys.argv[1:]) + '\n') headerWritten = False file.flush() @@ -1097,7 +1097,7 @@ for incCount,position in enumerate(locations): # walk through locations if options.elemScalar: for label in options.elemScalar: - if assembleHeader: + if assembleHeader: header += [''.join( label.split() )] newby.append({'label':label, 'len':1, @@ -1105,17 +1105,17 @@ for incCount,position in enumerate(locations): # walk through locations if options.elemTensor: for label in options.elemTensor: - if assembleHeader: + if assembleHeader: header += heading('.',[[''.join( label.split() ),component] for component in ['intensity','t11','t22','t33','t12','t23','t13']]) myTensor = p.element_tensor(p.element_sequence(e),stat['IndexOfLabel'][label])[n_local] newby.append({'label':label, 'len':7, - 'content':[ myTensor.intensity, + 'content':[ myTensor.intensity, myTensor.t11, myTensor.t22, myTensor.t33, myTensor.t12, myTensor.t23, myTensor.t13, ]}) - + if options.homogenizationResult or \ options.crystalliteResult or \ options.constitutiveResult: @@ -1135,7 +1135,7 @@ for incCount,position in enumerate(locations): # walk through locations try: newby.append({'label':label, 'len':length, - 'content':[ p.element_scalar(p.element_sequence(e),stat['IndexOfLabel'][head])[n_local].value + 'content':[ p.element_scalar(p.element_sequence(e),stat['IndexOfLabel'][head])[n_local].value for head in thisHead ]}) except KeyError: print '\nDAMASK outputs seem missing from "post" section of the *.dat file!' @@ -1165,7 +1165,7 @@ for incCount,position in enumerate(locations): # walk through locations group[0] + \ mappedResult) ) + '\n') - + if fileOpen: file.close() From e7a174abc194001056d9fac77c0ebfbf413fe887 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 18 Jul 2016 19:19:51 +0200 Subject: [PATCH 3/5] cleaner code --- installation/symlink_Code.py | 2 +- installation/symlink_Processing.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/symlink_Code.py b/installation/symlink_Code.py index 5d4518ddd..82b68c2a8 100755 --- a/installation/symlink_Code.py +++ b/installation/symlink_Code.py @@ -40,7 +40,7 @@ for version in MarcReleases: os.remove(sym_link) sys.stdout.write(sym_link) else: - sys.stdout.write(damask.util.bcolors.BOLD + sym_link + damask.util.bcolors.ENDC) + sys.stdout.write(damask.util.emph(sym_link)) os.symlink(src,sym_link) sys.stdout.write(' -> '+src+'\n') diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py index 3f00e95c6..56f4d73e3 100755 --- a/installation/symlink_Processing.py +++ b/installation/symlink_Processing.py @@ -29,7 +29,7 @@ for subDir in processing_subDirs: os.remove(sym_link) sys.stdout.write(sym_link) else: - sys.stdout.write(damask.util.bcolors.BOLD + sym_link + damask.util.bcolors.ENDC) + sys.stdout.write(damask.util.emph(sym_link)) os.symlink(src,sym_link) sys.stdout.write(' -> '+src+'\n') From cd63a927333b93061ef90b3511cf0b20f4777b9c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 18 Jul 2016 19:35:35 +0200 Subject: [PATCH 4/5] using python 2.7 has shebang will also work on mac without symlink unless someone uses the 6 year old python 2.6, this should be save --- installation/symlink_Code.py | 2 +- installation/symlink_Processing.py | 2 +- processing/misc/OIMgrainFile_toTable.py | 2 +- processing/misc/ang_toTable.py | 2 +- processing/misc/gwyddion_filter.py | 2 +- processing/misc/vtk_fromGwyddion.py | 2 +- processing/misc/yieldSurface.py | 2 +- processing/post/addAPS34IDEstrainCoords.py | 2 +- processing/post/addCalculation.py | 2 +- processing/post/addCauchy.py | 2 +- processing/post/addCompatibilityMismatch.py | 2 +- processing/post/addCumulative.py | 2 +- processing/post/addCurl.py | 2 +- processing/post/addDeterminant.py | 2 +- processing/post/addDeviator.py | 2 +- processing/post/addDisplacement.py | 2 +- processing/post/addDivergence.py | 2 +- processing/post/addEhkl.py | 2 +- processing/post/addEuclideanDistance.py | 2 +- processing/post/addGradient.py | 2 +- processing/post/addGrainID.py | 2 +- processing/post/addIPFcolor.py | 2 +- processing/post/addInfo.py | 2 +- processing/post/addMapped.py | 2 +- processing/post/addMises.py | 2 +- processing/post/addNorm.py | 2 +- processing/post/addOrientations.py | 2 +- processing/post/addPK2.py | 2 +- processing/post/addPole.py | 2 +- processing/post/addSchmidfactors.py | 2 +- processing/post/addSpectralDecomposition.py | 2 +- processing/post/addStrainTensors.py | 2 +- processing/post/addTable.py | 2 +- processing/post/averageDown.py | 2 +- processing/post/averageTable.py | 2 +- processing/post/binXY.py | 2 +- processing/post/blowUp.py | 2 +- processing/post/filterTable.py | 2 +- processing/post/histogram.py | 2 +- processing/post/imageData.py | 2 +- processing/post/imageDataDeformed.py | 2 +- processing/post/imageDataRGB.py | 2 +- processing/post/mentat_colorMap.py | 2 +- processing/post/perceptualUniformColorMap.py | 2 +- processing/post/permuteData.py | 2 +- processing/post/postResults.py | 2 +- processing/post/reLabel.py | 2 +- processing/post/rotateData.py | 2 +- processing/post/scaleData.py | 2 +- processing/post/shiftData.py | 2 +- processing/post/showTable.py | 2 +- processing/post/sortTable.py | 2 +- processing/post/vtk2ang.py | 2 +- processing/post/vtk_addPointcloudData.py | 2 +- processing/post/vtk_addRectilinearGridData.py | 2 +- processing/post/vtk_pointcloud.py | 2 +- processing/post/vtk_rectilinearGrid.py | 2 +- processing/pre/OIMlinear2linearODF.py | 2 +- processing/pre/abq_addUserOutput.py | 2 +- processing/pre/geom_addPrimitive.py | 2 +- processing/pre/geom_canvas.py | 2 +- processing/pre/geom_clean.py | 2 +- processing/pre/geom_fromMinimalSurface.py | 2 +- processing/pre/geom_fromOsteonGeometry.py | 2 +- processing/pre/geom_fromTable.py | 2 +- processing/pre/geom_fromVPSC.py | 2 +- processing/pre/geom_fromVoronoiTessellation.py | 2 +- processing/pre/geom_grainGrowth.py | 2 +- processing/pre/geom_pack.py | 2 +- processing/pre/geom_rescale.py | 2 +- processing/pre/geom_rotate.py | 2 +- processing/pre/geom_toTable.py | 2 +- processing/pre/geom_translate.py | 2 +- processing/pre/geom_unpack.py | 2 +- processing/pre/geom_vicinityOffset.py | 2 +- processing/pre/gmsh_identifySurfaces.py | 2 +- processing/pre/hybridIA_linODFsampling.py | 2 +- processing/pre/marc_addUserOutput.py | 2 +- processing/pre/mentat_pbcOnBoxMesh.py | 2 +- processing/pre/mentat_spectralBox.py | 2 +- processing/pre/patchFromReconstructedBoundaries.py | 2 +- processing/pre/seeds_fromDistribution.py | 2 +- processing/pre/seeds_fromGeom.py | 2 +- processing/pre/seeds_fromPokes.py | 2 +- processing/pre/seeds_fromRandom.py | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/installation/symlink_Code.py b/installation/symlink_Code.py index 82b68c2a8..1e67c8a7b 100755 --- a/installation/symlink_Code.py +++ b/installation/symlink_Code.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py index 56f4d73e3..6cb8f9135 100755 --- a/installation/symlink_Processing.py +++ b/installation/symlink_Processing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- # Makes postprocessing routines acessible from everywhere. diff --git a/processing/misc/OIMgrainFile_toTable.py b/processing/misc/OIMgrainFile_toTable.py index 30cfee2f4..74d5d1819 100755 --- a/processing/misc/OIMgrainFile_toTable.py +++ b/processing/misc/OIMgrainFile_toTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/misc/ang_toTable.py b/processing/misc/ang_toTable.py index 110ea6ddf..177955f17 100755 --- a/processing/misc/ang_toTable.py +++ b/processing/misc/ang_toTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/misc/gwyddion_filter.py b/processing/misc/gwyddion_filter.py index fd4df19a0..d5b1e39f0 100755 --- a/processing/misc/gwyddion_filter.py +++ b/processing/misc/gwyddion_filter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,string,scipy diff --git a/processing/misc/vtk_fromGwyddion.py b/processing/misc/vtk_fromGwyddion.py index 8fa206074..e64bf4393 100755 --- a/processing/misc/vtk_fromGwyddion.py +++ b/processing/misc/vtk_fromGwyddion.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,string,vtk diff --git a/processing/misc/yieldSurface.py b/processing/misc/yieldSurface.py index d636c37f3..15f97113a 100755 --- a/processing/misc/yieldSurface.py +++ b/processing/misc/yieldSurface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import threading,time,os diff --git a/processing/post/addAPS34IDEstrainCoords.py b/processing/post/addAPS34IDEstrainCoords.py index 7ba976478..a630a476b 100755 --- a/processing/post/addAPS34IDEstrainCoords.py +++ b/processing/post/addAPS34IDEstrainCoords.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addCalculation.py b/processing/post/addCalculation.py index 8b5dd1d33..5e8c155b1 100755 --- a/processing/post/addCalculation.py +++ b/processing/post/addCalculation.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,re,sys diff --git a/processing/post/addCauchy.py b/processing/post/addCauchy.py index beebb0422..2f69cb043 100755 --- a/processing/post/addCauchy.py +++ b/processing/post/addCauchy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index d311c286b..107d5d3d1 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/post/addCumulative.py b/processing/post/addCumulative.py index a577b68fe..37bd7b5de 100755 --- a/processing/post/addCumulative.py +++ b/processing/post/addCumulative.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 79bb5f848..fab704325 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDeterminant.py b/processing/post/addDeterminant.py index dc04dd8ff..1f721c27e 100755 --- a/processing/post/addDeterminant.py +++ b/processing/post/addDeterminant.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addDeviator.py b/processing/post/addDeviator.py index d96564d4c..1cf301161 100755 --- a/processing/post/addDeviator.py +++ b/processing/post/addDeviator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index a1a476185..2be5dcc21 100755 --- a/processing/post/addDisplacement.py +++ b/processing/post/addDisplacement.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index 4c24eea3c..ebd9e70d3 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addEhkl.py b/processing/post/addEhkl.py index 7b745526a..f7a143466 100755 --- a/processing/post/addEhkl.py +++ b/processing/post/addEhkl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index 8cb6c3b83..dad334beb 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,itertools diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index 5ded3fc90..b77af853e 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addGrainID.py b/processing/post/addGrainID.py index 232790580..c39d67983 100755 --- a/processing/post/addGrainID.py +++ b/processing/post/addGrainID.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,time,copy diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index 6a9e39e18..cedd075c1 100755 --- a/processing/post/addIPFcolor.py +++ b/processing/post/addIPFcolor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addInfo.py b/processing/post/addInfo.py index 2c8749d0c..50f003d6b 100755 --- a/processing/post/addInfo.py +++ b/processing/post/addInfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/post/addMapped.py b/processing/post/addMapped.py index da36097d4..c57e62d8b 100755 --- a/processing/post/addMapped.py +++ b/processing/post/addMapped.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addMises.py b/processing/post/addMises.py index 9d6a9f9db..2ce350dbd 100755 --- a/processing/post/addMises.py +++ b/processing/post/addMises.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addNorm.py b/processing/post/addNorm.py index 0911e5784..68249379a 100755 --- a/processing/post/addNorm.py +++ b/processing/post/addNorm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index 2f88107df..3c1f6dabc 100755 --- a/processing/post/addOrientations.py +++ b/processing/post/addOrientations.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addPK2.py b/processing/post/addPK2.py index 59084a88c..80f5843ec 100755 --- a/processing/post/addPK2.py +++ b/processing/post/addPK2.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addPole.py b/processing/post/addPole.py index 6cbd26880..291c5a712 100755 --- a/processing/post/addPole.py +++ b/processing/post/addPole.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py index 828132471..0bc529034 100755 --- a/processing/post/addSchmidfactors.py +++ b/processing/post/addSchmidfactors.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addSpectralDecomposition.py b/processing/post/addSpectralDecomposition.py index 2f8f32fd7..aa87e6f3c 100755 --- a/processing/post/addSpectralDecomposition.py +++ b/processing/post/addSpectralDecomposition.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addStrainTensors.py b/processing/post/addStrainTensors.py index 654d7583a..ee760a65b 100755 --- a/processing/post/addStrainTensors.py +++ b/processing/post/addStrainTensors.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/addTable.py b/processing/post/addTable.py index 53774b5d7..82799b4f5 100755 --- a/processing/post/addTable.py +++ b/processing/post/addTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index ec8e6e8ed..9ad1b7d0b 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/averageTable.py b/processing/post/averageTable.py index b059404c9..25c09625c 100755 --- a/processing/post/averageTable.py +++ b/processing/post/averageTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/binXY.py b/processing/post/binXY.py index 693b71e59..4fd635120 100755 --- a/processing/post/binXY.py +++ b/processing/post/binXY.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/blowUp.py b/processing/post/blowUp.py index 430a4f388..49156c8f4 100755 --- a/processing/post/blowUp.py +++ b/processing/post/blowUp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index 41a0634f3..231c52960 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,re,sys,fnmatch diff --git a/processing/post/histogram.py b/processing/post/histogram.py index ea67aa770..0f7d73fdc 100755 --- a/processing/post/histogram.py +++ b/processing/post/histogram.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/imageData.py b/processing/post/imageData.py index b1afcb3de..41996a3c6 100755 --- a/processing/post/imageData.py +++ b/processing/post/imageData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/imageDataDeformed.py b/processing/post/imageDataDeformed.py index a15839b22..14c4df7c2 100755 --- a/processing/post/imageDataDeformed.py +++ b/processing/post/imageDataDeformed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/imageDataRGB.py b/processing/post/imageDataRGB.py index 4d4aa1f8d..4f124507e 100755 --- a/processing/post/imageDataRGB.py +++ b/processing/post/imageDataRGB.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/mentat_colorMap.py b/processing/post/mentat_colorMap.py index b72f48afe..d412890b6 100755 --- a/processing/post/mentat_colorMap.py +++ b/processing/post/mentat_colorMap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index 0bf655f2a..85acd073b 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import sys,os diff --git a/processing/post/permuteData.py b/processing/post/permuteData.py index 54a18576f..0cbf6039a 100755 --- a/processing/post/permuteData.py +++ b/processing/post/permuteData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/postResults.py b/processing/post/postResults.py index c81f561d5..7e23b7278 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math,re,time,struct diff --git a/processing/post/reLabel.py b/processing/post/reLabel.py index b704a2ee5..e5979122e 100755 --- a/processing/post/reLabel.py +++ b/processing/post/reLabel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,re diff --git a/processing/post/rotateData.py b/processing/post/rotateData.py index 32eaaad13..08958cc86 100755 --- a/processing/post/rotateData.py +++ b/processing/post/rotateData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/scaleData.py b/processing/post/scaleData.py index 18883eb0b..d33efa268 100755 --- a/processing/post/scaleData.py +++ b/processing/post/scaleData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/shiftData.py b/processing/post/shiftData.py index 4052d83d9..cac0e54f0 100755 --- a/processing/post/shiftData.py +++ b/processing/post/shiftData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/showTable.py b/processing/post/showTable.py index c65b4519f..918256af9 100755 --- a/processing/post/showTable.py +++ b/processing/post/showTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/post/sortTable.py b/processing/post/sortTable.py index f1298af86..92fa81672 100755 --- a/processing/post/sortTable.py +++ b/processing/post/sortTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/post/vtk2ang.py b/processing/post/vtk2ang.py index bc8e23097..c315902ef 100755 --- a/processing/post/vtk2ang.py +++ b/processing/post/vtk2ang.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,string,math,sys diff --git a/processing/post/vtk_addPointcloudData.py b/processing/post/vtk_addPointcloudData.py index 3590a436e..340ef700e 100755 --- a/processing/post/vtk_addPointcloudData.py +++ b/processing/post/vtk_addPointcloudData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,vtk diff --git a/processing/post/vtk_addRectilinearGridData.py b/processing/post/vtk_addRectilinearGridData.py index 76eed6aec..63e0bf783 100755 --- a/processing/post/vtk_addRectilinearGridData.py +++ b/processing/post/vtk_addRectilinearGridData.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,vtk diff --git a/processing/post/vtk_pointcloud.py b/processing/post/vtk_pointcloud.py index 995f5a216..339ff2c17 100755 --- a/processing/post/vtk_pointcloud.py +++ b/processing/post/vtk_pointcloud.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,vtk diff --git a/processing/post/vtk_rectilinearGrid.py b/processing/post/vtk_rectilinearGrid.py index 32ea2c11c..73a64c4aa 100755 --- a/processing/post/vtk_rectilinearGrid.py +++ b/processing/post/vtk_rectilinearGrid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,vtk diff --git a/processing/pre/OIMlinear2linearODF.py b/processing/pre/OIMlinear2linearODF.py index cbcbcc7ec..d50c07a37 100755 --- a/processing/pre/OIMlinear2linearODF.py +++ b/processing/pre/OIMlinear2linearODF.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/abq_addUserOutput.py b/processing/pre/abq_addUserOutput.py index 4528537d9..fea8d57b4 100755 --- a/processing/pre/abq_addUserOutput.py +++ b/processing/pre/abq_addUserOutput.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import sys,os,re diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 8976a9e3d..952ba0c4b 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index 4b482d641..831a2b251 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_clean.py b/processing/pre/geom_clean.py index 1409a1366..c61cf5ef9 100755 --- a/processing/pre/geom_clean.py +++ b/processing/pre/geom_clean.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromMinimalSurface.py b/processing/pre/geom_fromMinimalSurface.py index 1c4fc2eaa..a346aa11d 100755 --- a/processing/pre/geom_fromMinimalSurface.py +++ b/processing/pre/geom_fromMinimalSurface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromOsteonGeometry.py b/processing/pre/geom_fromOsteonGeometry.py index 9a24b3e2d..9f85f99aa 100755 --- a/processing/pre/geom_fromOsteonGeometry.py +++ b/processing/pre/geom_fromOsteonGeometry.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py index 91b4c2670..4f786af9e 100755 --- a/processing/pre/geom_fromTable.py +++ b/processing/pre/geom_fromTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math,types,time diff --git a/processing/pre/geom_fromVPSC.py b/processing/pre/geom_fromVPSC.py index 3f76ffe2e..a1208170b 100755 --- a/processing/pre/geom_fromVPSC.py +++ b/processing/pre/geom_fromVPSC.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index fd334620f..d18e38b9c 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_grainGrowth.py b/processing/pre/geom_grainGrowth.py index 9184bd226..43e2e49d9 100755 --- a/processing/pre/geom_grainGrowth.py +++ b/processing/pre/geom_grainGrowth.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_pack.py b/processing/pre/geom_pack.py index 168cfe1d6..cfa329698 100755 --- a/processing/pre/geom_pack.py +++ b/processing/pre/geom_pack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/geom_rescale.py b/processing/pre/geom_rescale.py index 2c779f3d3..f2d9966d6 100755 --- a/processing/pre/geom_rescale.py +++ b/processing/pre/geom_rescale.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py index bb6acd35c..1e570ca70 100755 --- a/processing/pre/geom_rotate.py +++ b/processing/pre/geom_rotate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_toTable.py b/processing/pre/geom_toTable.py index 680b218cf..d34d101e0 100755 --- a/processing/pre/geom_toTable.py +++ b/processing/pre/geom_toTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index 6c5eb5391..83c71aa8d 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_unpack.py b/processing/pre/geom_unpack.py index 508946d4e..530d3889e 100755 --- a/processing/pre/geom_unpack.py +++ b/processing/pre/geom_unpack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index 8ef96608e..06cb482c6 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/gmsh_identifySurfaces.py b/processing/pre/gmsh_identifySurfaces.py index e42e352c8..642b0a71e 100755 --- a/processing/pre/gmsh_identifySurfaces.py +++ b/processing/pre/gmsh_identifySurfaces.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,re diff --git a/processing/pre/hybridIA_linODFsampling.py b/processing/pre/hybridIA_linODFsampling.py index 9ee4470b9..a04b28e38 100755 --- a/processing/pre/hybridIA_linODFsampling.py +++ b/processing/pre/hybridIA_linODFsampling.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- from optparse import OptionParser diff --git a/processing/pre/marc_addUserOutput.py b/processing/pre/marc_addUserOutput.py index 6f61b2d26..9bc336fd6 100755 --- a/processing/pre/marc_addUserOutput.py +++ b/processing/pre/marc_addUserOutput.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- """ diff --git a/processing/pre/mentat_pbcOnBoxMesh.py b/processing/pre/mentat_pbcOnBoxMesh.py index b35d9ab62..07f8e4b70 100755 --- a/processing/pre/mentat_pbcOnBoxMesh.py +++ b/processing/pre/mentat_pbcOnBoxMesh.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import sys,os diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index 6ff6e51d7..681aca724 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/patchFromReconstructedBoundaries.py b/processing/pre/patchFromReconstructedBoundaries.py index 9167c7398..ada92b09d 100755 --- a/processing/pre/patchFromReconstructedBoundaries.py +++ b/processing/pre/patchFromReconstructedBoundaries.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import sys,os,math,re diff --git a/processing/pre/seeds_fromDistribution.py b/processing/pre/seeds_fromDistribution.py index 096fbdfd8..18b2712e7 100755 --- a/processing/pre/seeds_fromDistribution.py +++ b/processing/pre/seeds_fromDistribution.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import threading,time,os,sys,random diff --git a/processing/pre/seeds_fromGeom.py b/processing/pre/seeds_fromGeom.py index 1f1c2aeed..6a249065b 100755 --- a/processing/pre/seeds_fromGeom.py +++ b/processing/pre/seeds_fromGeom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/seeds_fromPokes.py b/processing/pre/seeds_fromPokes.py index bf26591c1..5d2cc212f 100755 --- a/processing/pre/seeds_fromPokes.py +++ b/processing/pre/seeds_fromPokes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,math,sys diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index cf3db1b36..038690df4 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python2.7 # -*- coding: UTF-8 no BOM -*- import os,sys,math,random From ef2c8479a7098d66f3bc438880dea03b7d24c58b Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 19 Jul 2016 04:19:09 +0200 Subject: [PATCH 5/5] updated version information after successful test of v2.0.0-396-g03bb0b8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9b8617d3b..355497657 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-385-g1b30b18 +v2.0.0-396-g03bb0b8