From 837b14592a3578560045a4c375f0875eca2b40e4 Mon Sep 17 00:00:00 2001
From: Philip Eisenlohr <eisenlohr@egr.msu.edu>
Date: Mon, 31 Jul 2017 09:34:30 -0400
Subject: [PATCH] addLinked can now link between vector-valued columns

---
 processing/post/addLinked.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/processing/post/addLinked.py b/processing/post/addLinked.py
index 5ea9abe43..dae1ff789 100755
--- a/processing/post/addLinked.py
+++ b/processing/post/addLinked.py
@@ -48,17 +48,16 @@ if options.asciitable is not None and os.path.isfile(options.asciitable):
                                   buffered = False,
                                   readonly = True) 
   linkedTable.head_read()                                                                           # read ASCII header info of linked table
-  if linkedTable.label_dimension(options.link[1]) != 1:
-    parser.error('linking column {} needs to be scalar valued.'.format(options.link[1]))
+  linkDim = linkedTable.label_dimension(options.link[1])                                            # dimension of linking column
 
-  missing_labels = linkedTable.data_readArray([options.link[1]]+options.label)
+  missing_labels = linkedTable.data_readArray([options.link[1]]+options.label)                      # try reading linked ASCII table
   linkedTable.close()                                                                               # close linked ASCII table
 
   if len(missing_labels) > 0:
     damask.util.croak('column{} {} not found...'.format('s' if len(missing_labels) > 1 else '',', '.join(missing_labels)))
 
-  index = linkedTable.data[:,0]
-  data  = linkedTable.data[:,1:]
+  index = linkedTable.data[:,:linkDim]
+  data  = linkedTable.data[:,linkDim:]
 else:
   parser.error('no linked ASCIItable given.')
 
@@ -80,8 +79,10 @@ for name in filenames:
 
   errors = []
 
-  linkColumn = table.label_index(options.link[0])  
-  if linkColumn <  0: errors.append('linking column {} not found.'.format(options.link[0]))
+  myLink    = table.label_index    (options.link[0])  
+  myLinkDim = table.label_dimension(options.link[0])  
+  if myLink <  0:          errors.append('linking column {} not found.'.format(options.link[0]))
+  if myLinkDim != linkDim: errors.append('dimension mismatch for column {}.'.format(options.link[0]))
 
   if errors != []:
     damask.util.croak(errors)
@@ -91,7 +92,7 @@ for name in filenames:
 # ------------------------------------------ assemble header --------------------------------------
 
   table.info_append(scriptID + '\t' + ' '.join(sys.argv[1:]))
-  table.labels_append(linkedTable.labels(raw = True)[1:])                                           # extend with new labels (except for linked column)
+  table.labels_append(linkedTable.labels(raw = True)[linkDim:])                                     # extend with new labels (except for linked column)
   
   table.head_write()
 
@@ -100,7 +101,12 @@ for name in filenames:
   outputAlive = True
   while outputAlive and table.data_read():                                                          # read next data line of ASCII table
     try:
-      table.data_append(data[np.argwhere(index == float(table.data[linkColumn]))[0]])               # add data from first matching line
+      table.data_append(
+        data[
+          np.argwhere(np.all(
+            (map(float,table.data[myLink:myLink+myLinkDim]) - index) == 0,
+             axis = 1))[0]
+            ])                                                                                      # add data from first matching line
     except IndexError:
       table.data_append(np.nan*np.ones_like(data[0]))                                               # or add NaNs
     outputAlive = table.data_write()                                                                # output processed line