svn caused trouble due to rename, again some missing files

processing/pre/seeds_fromGeom.py

@@ -1,32 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 no BOM -*-
 
-import os,sys,string,numpy,damask
+import os,sys,string
-from optparse import OptionParser, Option
+import numpy as np
+from optparse import OptionParser
+import damask
 
 scriptID = '$Id$'
 scriptName = scriptID.split()[1]
 
-# -----------------------------
-class extendableOption(Option):
-# -----------------------------
-# used for definition of new option parser action 'extend', which enables to take multiple option arguments
-# taken from online tutorial http://docs.python.org/library/optparse.html
-  
-  ACTIONS = Option.ACTIONS + ("extend",)
-  STORE_ACTIONS = Option.STORE_ACTIONS + ("extend",)
-  TYPED_ACTIONS = Option.TYPED_ACTIONS + ("extend",)
-  ALWAYS_TYPED_ACTIONS = Option.ALWAYS_TYPED_ACTIONS + ("extend",)
-
-  def take_action(self, action, dest, opt, value, values, parser):
-    if action == "extend":
-      lvalue = value.split(",")
-      values.ensure_value(dest, []).extend(lvalue)
-    else:
-      Option.take_action(self, action, dest, opt, value, values, parser)
-
-
-
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
@@ -48,13 +30,10 @@ mappings = {
           }
 
 
-parser = OptionParser(option_class=extendableOption, usage='%prog options [file[s]]', description = """
+parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """
 Create seed file taking microstructure indices from given geom file but excluding black-listed grains.
 
-Examples:
+""", version = scriptID)
-""" + string.replace(scriptID,'\n','\\n')
-)
-
 
 parser.add_option('-w','--white',   dest='whitelist', action='extend', \
                                     help='white list of grain IDs', metavar='<LIST>')
@@ -96,15 +75,15 @@ for file in files:
 
 #--- interpret header ----------------------------------------------------------------------------
   info = {
-          'grid':    numpy.zeros(3,'i'),
+          'grid':    np.zeros(3,'i'),
-          'size':    numpy.zeros(3,'d'),
+          'size':    np.zeros(3,'d'),
-          'origin':  numpy.zeros(3,'d'),
+          'origin':  np.zeros(3,'d'),
           'homogenization':  0,
           'microstructures': 0,
          }
   newInfo = {
-          'grid':    numpy.zeros(3,'i'),
+          'grid':    np.zeros(3,'i'),
-          'origin':  numpy.zeros(3,'d'),
+          'origin':  np.zeros(3,'d'),
           'microstructures': 0,
          }
   extra_header = []
@@ -130,17 +109,17 @@ for file in files:
                       'homogenization:  %i\n'%info['homogenization'] + \
                       'microstructures: %i\n'%info['microstructures'])
 
-  if numpy.any(info['grid'] < 1):
+  if np.any(info['grid'] < 1):
     file['croak'].write('invalid grid a b c.\n')
     continue
-  if numpy.any(info['size'] <= 0.0):
+  if np.any(info['size'] <= 0.0):
     file['croak'].write('invalid size x y z.\n')
     continue
   if 'origin' not in info:
-    info['origin'] = numpy.zeros(3)
+    info['origin'] = np.zeros(3)
 
 #--- read data ------------------------------------------------------------------------------------
-  microstructure = numpy.zeros(info['grid'].prod(),'i')                                            # initialize as flat array
+  microstructure = np.zeros(info['grid'].prod(),'i')                                            # initialize as flat array
   i = 0
   while table.data_read():
     items = table.data
@@ -171,7 +150,7 @@ for file in files:
   table.data_clear()
   i = 0
   outputDead = False
-  coord = numpy.zeros(3,'d')
+  coord = np.zeros(3,'d')
   for coord[2] in xrange(info['grid'][2]):
     for coord[1] in xrange(info['grid'][1]):
       for coord[0] in xrange(info['grid'][0]):
@@ -191,4 +170,4 @@ for file in files:
 
   table.input_close()                                                       # close input ASCII table
   if file['name'] != 'STDIN':
-    table.output_close()                                                    # close output ASCII table
+    table.output_close()                                                    # close output ASCII table

processing/pre/seeds_fromRandom.py

@@ -30,17 +30,21 @@ parser.set_defaults(randomSeed = None)
 parser.set_defaults(grid = (16,16,16))
 parser.set_defaults(N = 20)
 
-(options, extras) = parser.parse_args()
+(options,filename) = parser.parse_args()
 options.grid = np.array(options.grid)
 
-sys.stderr.write('\033[1m'+scriptName+'\033[0m\n')
+# ------------------------------------------ setup file handle -------------------------------------
+if filename == []:
+  file = {'output':sys.stdout, 'croak':sys.stderr}
+else:
+  file = {'output':open(filename[0],'w'), 'croak':sys.stderr}
 
 gridSize = options.grid.prod()
 if gridSize == 0:
-  sys.stderr.write('zero grid dimension for %s.\n'%(', '.join([['a','b','c'][x] for x in np.where(options.grid == 0)[0]])))
+  file['croak'].write('zero grid dimension for %s.\n'%(', '.join([['a','b','c'][x] for x in np.where(options.grid == 0)[0]])))
   sys.exit()
 if options.N > gridSize: 
-  sys.stderr.write('accommodating only %i seeds on grid.\n'%gridSize)
+  file['croak'].write('accommodating only %i seeds on grid.\n'%gridSize)
   options.N = gridSize
 if options.randomSeed == None:
   options.randomSeed = int(os.urandom(4).encode('hex'), 16)
@@ -81,5 +85,5 @@ header = ["5\theader",
          ]
 
 for line in header:
-  sys.stdout.write(line+"\n")
+  file['output'].write(line+"\n")
-np.savetxt(sys.stdout,np.transpose(np.concatenate((seeds,grainEuler),axis = 0)),fmt='%10.6f',delimiter='\t')
+np.savetxt(file['output'],np.transpose(np.concatenate((seeds,grainEuler),axis = 0)),fmt='%10.6f',delimiter='\t')