simplified grid/size synonyms treatment

processing/pre/geom_canvas.py

@@ -27,6 +27,10 @@ class extendedOption(Option):
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
+synonyms = {
+        'grid':   ['resolution'],
+        'size':   ['dimension'],
+          }
 identifiers = {
         'grid':   ['a','b','c'],
         'size':   ['x','y','z'],
@@ -100,8 +104,8 @@ for file in files:
   for header in theTable.info:
     headitems = map(str.lower,header.split())
     if len(headitems) == 0: continue                                                              # skip blank lines
-    if headitems[0] == 'resolution': headitems[0] = 'grid'
+    for synonym,alternatives in synonyms.iteritems():
-    if headitems[0] == 'dimension':  headitems[0] = 'size'
+      if headitems[0] in alternatives: headitems[0] = synonym
     if headitems[0] in mappings.keys():
       if headitems[0] in identifiers.keys():
         for i in xrange(len(identifiers[headitems[0]])):

processing/pre/geom_check.py

@@ -27,6 +27,10 @@ class extendedOption(Option):
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
+synonyms = {
+        'grid':   ['resolution'],
+        'size':   ['dimension'],
+          }
 identifiers = {
         'grid':    ['a','b','c'],
         'size':    ['x','y','z'],
@@ -77,15 +81,15 @@ for file in files:
           'grid':   numpy.zeros(3,'i'),
           'size':   numpy.zeros(3,'d'),
           'origin': numpy.zeros(3,'d'),
+          'homogenization':  0,
           'microstructures': 0,
-          'homogenization':  0
          }
 
   for header in theTable.info:
     headitems = map(str.lower,header.split())
     if len(headitems) == 0: continue
-    if headitems[0] == 'resolution': headitems[0] = 'grid'
+    for synonym,alternatives in synonyms.iteritems():
-    if headitems[0] == 'dimension':  headitems[0] = 'size'
+      if headitems[0] in alternatives: headitems[0] = synonym
     if headitems[0] in mappings.keys():
       if headitems[0] in identifiers.keys():
         for i in xrange(len(identifiers[headitems[0]])):

processing/pre/geom_fromVoronoiTessellation.py

@@ -140,7 +140,7 @@ for file in files:
   for i in xrange(3):
     if info['size'][i] <= 0.0:                                                                      # any invalid size?
       info['size'][i] = float(info['grid'][i])/max(info['grid'])
-      file['croak'].write('rescaling size %i...\n'%i)
+      file['croak'].write('rescaling size %s...\n'%{0:'x',1:'y',2:'z'}[i])
 
   file['croak'].write('grains to map:  %i\n'%info['grains'] + \
                       'grid     a b c: %s\n'%(' x '.join(map(str,info['grid']))) + \
@@ -159,7 +159,6 @@ for file in files:
     continue
 
 #--- prepare data ---------------------------------------------------------------------------------
-  formatwidth = 1+int(math.log10(info['grains']))
   coords = (theData[:,:3]*info['size']).transpose()
   eulers = (theData[:,3:6]).transpose()
 
@@ -200,13 +199,14 @@ for file in files:
       "grid\ta %i\tb %i\tc %i"%(info['grid'][0],info['grid'][1],info['grid'][2],),
       "size\tx %f\ty %f\tz %f"%(info['size'][0],info['size'][1],info['size'][2],),
       "origin\tx %f\ty %f\tz %f"%(info['origin'][0],info['origin'][1],info['origin'][2],),
-      "microstructures\t%i"%(info['grains']-missing),
       "homogenization\t%i"%info['homogenization'],
+      "microstructures\t%i"%(info['grains']-missing),
       ])
     theTable.head_write()
     theTable.output_flush()
     
 # --- write microstructure information ------------------------------------------------------------
+    formatwidth = 1+int(math.log10(info['grains']))
     theTable.data = indices.reshape(info['grid'][1]*info['grid'][2],info['grid'][0])
     theTable.data_writeArray('%%%ii'%(formatwidth))
     

processing/pre/geom_pack.py

@@ -27,6 +27,10 @@ class extendedOption(Option):
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
+synonyms = {
+        'grid':   ['resolution'],
+        'size':   ['dimension'],
+          }
 identifiers = {
         'grid':    ['a','b','c'],
         'size':    ['x','y','z'],
@@ -85,8 +89,8 @@ for file in files:
   for header in theTable.info:
     headitems = map(str.lower,header.split())
     if len(headitems) == 0: continue
-    if headitems[0] == 'resolution': headitems[0] = 'grid'
+    for synonym,alternatives in synonyms.iteritems():
-    if headitems[0] == 'dimension':  headitems[0] = 'size'
+      if headitems[0] in alternatives: headitems[0] = synonym
     if headitems[0] in mappings.keys():
       if headitems[0] in identifiers.keys():
         for i in xrange(len(identifiers[headitems[0]])):

processing/pre/geom_translate.py

@@ -26,6 +26,10 @@ class extendedOption(Option):
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
+synonyms = {
+        'grid':   ['resolution'],
+        'size':   ['dimension'],
+          }
 identifiers = {
         'grid':    ['a','b','c'],
         'size':    ['x','y','z'],
@@ -103,8 +107,8 @@ for file in files:
   for header in theTable.info:
     headitems = map(str.lower,header.split())
     if len(headitems) == 0: continue
-    if headitems[0] == 'resolution': headitems[0] = 'grid'
+    for synonym,alternatives in synonyms.iteritems():
-    if headitems[0] == 'dimension':  headitems[0] = 'size'
+      if headitems[0] in alternatives: headitems[0] = synonym
     if headitems[0] in mappings.keys():
       if headitems[0] in identifiers.keys():
         for i in xrange(len(identifiers[headitems[0]])):

processing/pre/geom_unpack.py

@@ -27,6 +27,10 @@ class extendedOption(Option):
 #--------------------------------------------------------------------------------------------------
 #                                MAIN
 #--------------------------------------------------------------------------------------------------
+synonyms = {
+        'grid':   ['resolution'],
+        'size':   ['dimension'],
+          }
 identifiers = {
         'grid':      ['a','b','c'],
         'size':      ['x','y','z'],
@@ -90,8 +94,8 @@ for file in files:
   for header in theTable.info:
     headitems = map(str.lower,header.split())
     if len(headitems) == 0: continue
-    if headitems[0] == 'resolution': headitems[0] = 'grid'
+    for synonym,alternatives in synonyms.iteritems():
-    if headitems[0] == 'dimension':  headitems[0] = 'size'
+      if headitems[0] in alternatives: headitems[0] = synonym
     if headitems[0] in mappings.keys():
       if headitems[0] in identifiers.keys():
         for i in xrange(len(identifiers[headitems[0]])):