update to changes in Result class

processing/post/DADF5_postResults.py

@@ -36,19 +36,14 @@ if options.con is None: options.con=[]
 # --- loop over input files ------------------------------------------------------------------------
 
 for filename in options.filenames:
-  results = damask.DADF5(filename)
+    results = damask.Result(filename)
 
     if not results.structured: continue
-  if results.version_major == 0 and results.version_minor >= 5:
     coords = damask.grid_filters.cell_coord0(results.grid,results.size,results.origin)
-  else:
-    coords = damask.grid_filters.cell_coord0(results.grid,results.size)
 
     N_digits = int(np.floor(np.log10(int(results.increments[-1][3:]))))+1
     N_digits = 5 # hack to keep test intact
-  for i,inc in enumerate(results.iter_visible('increments')):
-    print('Output step {}/{}'.format(i+1,len(results.increments)))
-
+    for inc in damask.util.show_progress(results.iter_visible('increments'),len(results.increments)):
         table = damask.Table(np.ones(np.product(results.grid),dtype=int)*int(inc[3:]),{'inc':(1,)})
         table.add('pos',coords.reshape((-1,3)))
 

processing/post/DADF5toDREAM3D.py

@@ -55,15 +55,10 @@ parser.add_argument('-d','--dir', dest='dir',default='postProc',metavar='string'
 
 options = parser.parse_args()
 
-# --------------------------------------------------------------------
-# loop over input files
 for filename in options.filenames:
-  f = damask.DADF5(filename)  #DAMASK output file
-  for increment in options.inc:
-    f.set_by_increment(increment,increment)
-    if len(f.visible['increments']) == 0:
-      continue
-
+    f = damask.Result(filename)
+    f.pick('increments',options.inc)
+    for increment in damask.util.show_progress(f.iter_selection('increments'),len(f.selection['increments'])):
         #-------output file creation-------------------------------------
         dirname  = os.path.abspath(os.path.join(os.path.dirname(filename),options.dir))
         try:
@@ -77,7 +72,6 @@ for filename in options.filenames:
         o.attrs['FileVersion']    = '7.0' 
         #-----------------------------------------------------------------
         
-
         for g in ['DataContainerBundles','Pipeline']: # empty groups (needed)
             o.create_group(g)