relying on central functionality improves readability

processing/pre/seeds_fromGeom.py

@@ -58,11 +58,13 @@ for name in filenames:
                             microstructure),
                             axis=1)[mask]
     
-    comments = [scriptID + ' ' + ' '.join(sys.argv[1:]),
+    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)]
 
     table = damask.Table(seeds,{'pos':(3,),'microstructure':(1,)},comments)
-    table.to_ASCII(sys.stdout if name is None else os.path.splitext(name)[0]+'.seeds')
+    table.to_ASCII(sys.stdout if name is None else \
+                   os.path.splitext(name)[0]+'.seeds')

processing/pre/seeds_fromPokes.py

@@ -50,67 +50,45 @@ if filenames == []: filenames = [None]
 options.box = np.array(options.box).reshape(3,2)
 
 for name in filenames:
-  damask.util.report(scriptName,name)
+    damask.util.report(scriptName,name)
-  geom = damask.Geom.from_file(StringIO(''.join(sys.stdin.read())) if name is None else name)
+    geom = damask.Geom.from_file(StringIO(''.join(sys.stdin.read())) if name is None else name)
-  
-  table = damask.ASCIItable(name = name,
-                            outname = os.path.splitext(name)[-2]+'_poked_{}.seeds'.format(options.N) if name else name,
-                            buffered = False, labeled = False)
-
-  table.head_read()
-  info,extra_header = table.head_getGeom()
- 
-  grid = info['grid']
-  size = info['size']
-
-  offset =(np.amin(options.box, axis=1)*geom.grid/geom.size).astype(int)
-  box    = np.amax(options.box, axis=1) \
-         - np.amin(options.box, axis=1)
-
-  Nx = int(options.N/np.sqrt(options.N*geom.size[1]*box[1]/geom.size[0]/box[0]))
-  Ny = int(options.N/np.sqrt(options.N*geom.size[0]*box[0]/geom.size[1]/box[1]))
-  Nz = int(box[2]*geom.grid[2])
-
-  damask.util.croak('poking {} x {} x {} in box {} {} {}...'.format(Nx,Ny,Nz,*box))
-
-  seeds = np.zeros((Nx*Ny*Nz,4),'d')
-  g     = np.zeros(3,'i')
-
-  n = 0
-  for i in range(Nx):
-    for j in range(Ny):
-      g[0] = round((i+0.5)*box[0]*grid[0]/Nx-0.5)+offset[0]
-      g[1] = round((j+0.5)*box[1]*grid[1]/Ny-0.5)+offset[1]
-      for k in range(Nz):
-        g[2] = k + offset[2]
-        g %= grid
-        seeds[n,0:3] = (g+0.5)/grid                                                     # normalize coordinates to box
-        seeds[n,  3] = geom.microstructure[g[0],g[1],g[2]]
-        if options.x: g[0] += 1
-        if options.y: g[1] += 1
-        n += 1
-      
-
-# ------------------------------------------ assemble header ---------------------------------------
-  table.info_clear()
-  table.info_append(geom.comments+[
-    scriptID + ' ' + ' '.join(sys.argv[1:]),
-    "poking\ta {}\tb {}\tc {}".format(Nx,Ny,Nz),
-    "grid\ta {}\tb {}\tc {}".format(*geom.grid),
-    "size\tx {}\ty {}\tz {}".format(*geom.size),
-    "origin\tx {}\ty {}\tz {}".format(*geom.origin),
-    "homogenization\t{}".format(info['homogenization']),
-    ])
-  table.labels_clear()
-  table.labels_append(['{dim}_{label}'.format(dim = 1+i,label = 'pos') for i in range(3)]+['microstructure'])
-  table.head_write()
-  table.output_flush()
-  
-# --- write seeds information ------------------------------------------------------------
-
-  table.data = seeds
-  table.data_writeArray()
     
-# --- output finalization --------------------------------------------------------------------------
+    offset =(np.amin(options.box, axis=1)*geom.grid/geom.size).astype(int)
-
+    box    = np.amax(options.box, axis=1) \
-  table.close()                                                                                     # close ASCII table
+           - np.amin(options.box, axis=1)
+  
+    Nx = int(options.N/np.sqrt(options.N*geom.size[1]*box[1]/geom.size[0]/box[0]))
+    Ny = int(options.N/np.sqrt(options.N*geom.size[0]*box[0]/geom.size[1]/box[1]))
+    Nz = int(box[2]*geom.grid[2])
+  
+    damask.util.croak('poking {} x {} x {} in box {} {} {}...'.format(Nx,Ny,Nz,*box))
+  
+    seeds = np.zeros((Nx*Ny*Nz,4),'d')
+    g     = np.zeros(3,'i')
+  
+    n = 0
+    for i in range(Nx):
+        for j in range(Ny):
+            g[0] = round((i+0.5)*box[0]*geom.grid[0]/Nx-0.5)+offset[0]
+            g[1] = round((j+0.5)*box[1]*geom.grid[1]/Ny-0.5)+offset[1]
+            for k in range(Nz):
+                g[2] = k + offset[2]
+                g %= geom.grid
+                seeds[n,0:3] = (g+0.5)/geom.grid                                                    # normalize coordinates to box
+                seeds[n,  3] = geom.microstructure[g[0],g[1],g[2]]
+                if options.x: g[0] += 1
+                if options.y: g[1] += 1
+                n += 1
+        
+  
+    comments = geom.comments \
+             + [scriptID + ' ' + ' '.join(sys.argv[1:]),
+                "poking\ta {}\tb {}\tc {}".format(Nx,Ny,Nz),
+                "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)]
+  
+    table = damask.Table(seeds,{'pos':(3,),'microstructure':(1,)},comments)
+    table.to_ASCII(sys.stdout if name is None else \
+                   os.path.splitext(name)[0]+'_poked_{}.seeds'.format(options.N))