added test for converter from Ricardo's files

processing/pre/geom_fromVPSC.py

@@ -1,40 +1,21 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 no BOM -*-
 
-import os,sys,math,string,numpy
+import os,sys,math,string
-from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
+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
 #--------------------------------------------------------------------------------------------------
-parser = OptionParser(option_class=extendableOption, usage='%prog options [file[s]]', description = """
+parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """
 Generate geometry description and material configuration from input files used by R.A. Lebensohn
-""" + string.replace('$Id$','\n','\\n')
-)
 
+""", version = scriptID)
 
 parser.add_option('--column',          dest='column', type='int', metavar = 'int', \
                   help='data column to discriminate phase 1 from 2 [%default]')
@@ -81,9 +62,9 @@ for file in files:
   if file['name'] != 'STDIN': file['croak'].write(file['name']+'\n')
 
   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'),
           'microstructures': 0,
           'homogenization':  options.homogenization
          }
@@ -120,10 +101,10 @@ for file in files:
                       'homogenization:  %i\n'%info['homogenization'] + \
                       'microstructures: %i\n\n'%info['microstructures'])
 
-  if numpy.any(info['grid'] < 1):
+  if np.any(info['grid'] < 1):
     file['croak'].write('invalid grid a b c.\n')
     sys.exit()
-  if numpy.any(info['size'] <= 0.0):
+  if np.any(info['size'] <= 0.0):
     file['croak'].write('invalid size x y z.\n')
     sys.exit()
 
@@ -143,7 +124,7 @@ for file in files:
 
 #--- output finalization --------------------------------------------------------------------------  
   if file['name'] != 'STDIN':
-    table.output_close()  
+    file['output'].close()  
     os.rename(file['name']+'_tmp',os.path.splitext(file['name'])[0] + \
                                   {True: '_material.config',
                                    False:'.geom'}[options.config])

processing/pre/geom_fromVoronoiTessellation.py

@@ -54,6 +54,7 @@ mappings = {
 
 parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """
 Generate geometry description and material configuration by standard Voronoi tessellation of given seeds file.
+
 """, version = scriptID)
 
 parser.add_option('-g', '--grid', dest='grid', type='int', nargs = 3, metavar = 'int int int', \

processing/pre/geom_pack.py

@@ -36,7 +36,7 @@ compress geometry files with ranges "a to b" and/or multiples "n of x".
 
 (options, filenames) = parser.parse_args()
 
-# ------------------------------------------ setup file handles ------------------------------------
+# ------------------------------------------ setup file handles -----------------------------------
 files = []
 if filenames == []:
   files.append({'name':'STDIN', 'input':sys.stdin, 'output':sys.stdout, 'croak':sys.stderr})
@@ -45,7 +45,7 @@ else:
     if os.path.exists(name):
       files.append({'name':name, 'input':open(name), 'output':open(name+'_tmp','w'), 'croak':sys.stderr})
 
-# ------------------------------------------ loop over input files ---------------------------------
+# ------------------------------------------ loop over input files --------------------------------
 for file in files:
   if file['name'] != 'STDIN': file['croak'].write('\033[1m'+scriptName+'\033[0m: '+file['name']+'\n')
   else: file['croak'].write('\033[1m'+scriptName+'\033[0m\n')
@@ -53,7 +53,7 @@ for file in files:
   table = damask.ASCIItable(file['input'],file['output'],labels = False,buffered = False)           # make unbuffered ASCII_table
   table.head_read()                                                                                 # read ASCII header info
 
-#--- interpret header ----------------------------------------------------------------------------
+#--- interpret header -----------------------------------------------------------------------------
   info = {
           'grid':    np.zeros(3,'i'),
           'size':    np.zeros(3,'d'),

processing/pre/geom_unpack.py

@@ -31,7 +31,6 @@ mappings = {
 
 parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """
 Unpack geometry files containing ranges "a to b" and/or "n of x" multiples (exclusively in one line).
-
 """, version = scriptID)
 
 parser.add_option('-1', '--onedimensional', dest='oneD', action='store_true', \
@@ -58,6 +57,7 @@ for file in files:
   table = damask.ASCIItable(file['input'],file['output'],labels = False,buffered = False)           # make unbuffered ASCII_table
   table.head_read()                                                                                 # read ASCII header info
 
+
 #--- interpret header ----------------------------------------------------------------------------
   info = {
           'grid':    np.zeros(3,'i'),