using central functionality

processing/pre/geom_toTable.py

@@ -2,10 +2,8 @@
 
 import os
 import sys
-from optparse import OptionParser
 from io import StringIO
-
-import numpy as np
+from optparse import OptionParser
 
 import damask
 
@@ -24,38 +22,25 @@ Translate geom description into ASCIItable containing position and microstructur
 """, version = scriptID)
 
 (options, filenames) = parser.parse_args()
-
-
 if filenames == []: filenames = [None]
 
 for name in filenames:
     damask.util.report(scriptName,name)
 
     geom = damask.Geom.from_file(StringIO(''.join(sys.stdin.read())) if name is None else name)
-
     damask.util.croak(geom)
 
-# --- generate grid --------------------------------------------------------------------------------
+    coord0 = damask.grid_filters.cell_coord0(geom.grid,geom.size,geom.origin).reshape((-1,3),order='F')
 
-  grid   = geom.get_grid()
-  size   = geom.get_size()
-  origin = geom.get_origin()
+    comments = geom.comments \
+             + [scriptID + ' ' + ' '.join(sys.argv[1:]),
+                "grid\ta {}\tb {}\tc {}".format(*geom.grid),
+                "size\tx {}\ty {}\tz {}".format(*geom.size),
+                "origin\tx {}\ty {}\tz {}".format(*geom.origin),
+                "homogenization\t{}".format(geom.homogenization)]
 
-  x = (0.5 + np.arange(grid[0],dtype=float))/grid[0]*size[0]+origin[0]
-  y = (0.5 + np.arange(grid[1],dtype=float))/grid[1]*size[1]+origin[1]
-  z = (0.5 + np.arange(grid[2],dtype=float))/grid[2]*size[2]+origin[2]
+    table = damask.Table(coord0,{'pos':(3,)},comments)
+    table.add('microstructure',geom.microstructure.reshape((-1,1)))
 
-  xx = np.tile(          x,        grid[1]* grid[2])
-  yy = np.tile(np.repeat(y,grid[0]        ),grid[2])
-  zz =         np.repeat(z,grid[0]*grid[1])
-
-# ---  create ASCII table --------------------------------------------------------------------------
-
-  table = damask.ASCIItable(outname = os.path.splitext(name)[0]+'.txt' if name else name)
-  table.info_append(geom.get_comments() + [scriptID + '\t' + ' '.join(sys.argv[1:])])
-  table.labels_append(['{}_{}'.format(1+i,'pos') for i in range(3)]+['microstructure'])
-  table.head_write()
-  table.output_flush()
-  table.data = np.squeeze(np.dstack((xx,yy,zz,geom.microstructure.flatten('F'))),axis=0)
-  table.data_writeArray()
-  table.close()
+    table.to_ASCII(sys.stdout if name is None else \
+                   os.path.splitext(name)[0]+'.txt')