make information on modifications mandatory

processing/post/scaleData.py

@@ -35,58 +35,17 @@ parser.set_defaults(label  = [],
                    )
 
 (options,filenames) = parser.parse_args()
+if filenames == []: filenames = [None]
 
 if len(options.label) != len(options.factor):
     parser.error('number of column labels and factors do not match.')
 
-# --- loop over input files -------------------------------------------------------------------------
-
-if filenames == []: filenames = [None]
-
 for name in filenames:
-  try:
-    table = damask.ASCIItable(name = name,
-                              buffered = False)
-  except: continue
     damask.util.report(scriptName,name)
 
-# ------------------------------------------ read header ------------------------------------------
+    table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name)
+    for i,label in enumerate(options.label):
+        table.set_array(label,table.get_array(label)*float(options.factor[i]),
+                        scriptID+' '+' '.join(sys.argv[1:]))
 
-  table.head_read()
+    table.to_ASCII(sys.stdout if name is None else name)
-
-  errors  = []
-  remarks = []
-  columns  = []
-  dims     = []
-  factors  = []
-
-  for what,factor in zip(options.label,options.factor):
-    col = table.label_index(what)
-    if col < 0: remarks.append('column {} not found...'.format(what,type))
-    else:
-      columns.append(col)
-      factors.append(float(factor))
-      dims.append(table.label_dimension(what))
-
-  if remarks != []: damask.util.croak(remarks)
-  if errors  != []:
-    damask.util.croak(errors)
-    table.close(dismiss = True)
-    continue
-       
-# ------------------------------------------ assemble header ---------------------------------------  
-
-  table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:]))
-  table.head_write()
-
-# ------------------------------------------ process data ------------------------------------------
-
-  outputAlive = True
-  while outputAlive and table.data_read():                                                          # read next data line of ASCII table
-    for col,dim,factor in zip(columns,dims,factors):                                                # loop over items
-      table.data[col:col+dim] = factor * np.array(table.data[col:col+dim],'d')
-    outputAlive = table.data_write()                                                                # output processed line
-
-# ------------------------------------------ output finalization -----------------------------------  
-
-  table.close()                                                                                     # close ASCII tables

python/damask/table.py

@@ -83,8 +83,13 @@ class Table():
         else: 
             return self.data[label].to_numpy().reshape((-1,)+self.headings[label])
 
-    def set_array(self,label,array):
+    def set_array(self,label,array,info):
         """Set data."""
+        if np.prod(array.shape[1:],dtype=int) == 1: 
+            self.comments.append('{}: {}'.format(label,info))
+        else:
+            self.comments.append('{} {}: {}'.format(label,array.shape[1:],info))
+
         if re.match(r'[0-9]*?_',label):
             idx,key = label.split('_',1)
             iloc = self.data.columns.get_loc(key).tolist().index(True) + int(idx) -1