From a65a47f6d77c3716830827bc16c17107fff5da3c Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Mon, 23 Nov 2020 21:26:35 +0100
Subject: [PATCH] single source of truth

---
 processing/post/addSchmidfactors.py | 85 ++---------------------------
 1 file changed, 5 insertions(+), 80 deletions(-)

diff --git a/processing/post/addSchmidfactors.py b/processing/post/addSchmidfactors.py
index ffd525e14..8e1e4ffb7 100755
--- a/processing/post/addSchmidfactors.py
+++ b/processing/post/addSchmidfactors.py
@@ -14,84 +14,9 @@ scriptName = os.path.splitext(os.path.basename(__file__))[0]
 scriptID   = ' '.join([scriptName,damask.version])
 
 slipSystems = {
-'fcc':
-    np.array([
-    [+0,+1,-1 , +1,+1,+1],
-    [-1,+0,+1 , +1,+1,+1],
-    [+1,-1,+0 , +1,+1,+1],
-    [+0,-1,-1 , -1,-1,+1],
-    [+1,+0,+1 , -1,-1,+1],
-    [-1,+1,+0 , -1,-1,+1],
-    [+0,-1,+1 , +1,-1,-1],
-    [-1,+0,-1 , +1,-1,-1],
-    [+1,+1,+0 , +1,-1,-1],
-    [+0,+1,+1 , -1,+1,-1],
-    [+1,+0,-1 , -1,+1,-1],
-    [-1,-1,+0 , -1,+1,-1],
-   ],'d'),
-'bcc':
-    np.array([
-    [+1,-1,+1 , +0,+1,+1],
-    [-1,-1,+1 , +0,+1,+1],
-    [+1,+1,+1 , +0,-1,+1],
-    [-1,+1,+1 , +0,-1,+1],
-    [-1,+1,+1 , +1,+0,+1],
-    [-1,-1,+1 , +1,+0,+1],
-    [+1,+1,+1 , -1,+0,+1],
-    [+1,-1,+1 , -1,+0,+1],
-    [-1,+1,+1 , +1,+1,+0],
-    [-1,+1,-1 , +1,+1,+0],
-    [+1,+1,+1 , -1,+1,+0],
-    [+1,+1,-1 , -1,+1,+0],
-    [-1,+1,+1 , +2,+1,+1],
-    [+1,+1,+1 , -2,+1,+1],
-    [+1,+1,-1 , +2,-1,+1],
-    [+1,-1,+1 , +2,+1,-1],
-    [+1,-1,+1 , +1,+2,+1],
-    [+1,+1,-1 , -1,+2,+1],
-    [+1,+1,+1 , +1,-2,+1],
-    [-1,+1,+1 , +1,+2,-1],
-    [+1,+1,-1 , +1,+1,+2],
-    [+1,-1,+1 , -1,+1,+2],
-    [-1,+1,+1 , +1,-1,+2],
-    [+1,+1,+1 , +1,+1,-2],
-   ],'d'),
-'hex':
-    np.array([
-    [+2,-1,-1,+0 , +0,+0,+0,+1],
-    [-1,+2,-1,+0 , +0,+0,+0,+1],
-    [-1,-1,+2,+0 , +0,+0,+0,+1],
-    [+2,-1,-1,+0 , +0,+1,-1,+0],
-    [-1,+2,-1,+0 , -1,+0,+1,+0],
-    [-1,-1,+2,+0 , +1,-1,+0,+0],
-    [-1,+1,+0,+0 , +1,+1,-2,+0],
-    [+0,-1,+1,+0 , -2,+1,+1,+0],
-    [+1,+0,-1,+0 , +1,-2,+1,+0],
-    [-1,+2,-1,+0 , +1,+0,-1,+1],
-    [-2,+1,+1,+0 , +0,+1,-1,+1],
-    [-1,-1,+2,+0 , -1,+1,+0,+1],
-    [+1,-2,+1,+0 , -1,+0,+1,+1],
-    [+2,-1,-1,+0 , +0,-1,+1,+1],
-    [+1,+1,-2,+0 , +1,-1,+0,+1],
-    [-2,+1,+1,+3 , +1,+0,-1,+1],
-    [-1,-1,+2,+3 , +1,+0,-1,+1],
-    [-1,-1,+2,+3 , +0,+1,-1,+1],
-    [+1,-2,+1,+3 , +0,+1,-1,+1],
-    [+1,-2,+1,+3 , -1,+1,+0,+1],
-    [+2,-1,-1,+3 , -1,+1,+0,+1],
-    [+2,-1,-1,+3 , -1,+0,+1,+1],
-    [+1,+1,-2,+3 , -1,+0,+1,+1],
-    [+1,+1,-2,+3 , +0,-1,+1,+1],
-    [-1,+2,-1,+3 , +0,-1,+1,+1],
-    [-1,+2,-1,+3 , +1,-1,+0,+1],
-    [-2,+1,+1,+3 , +1,-1,+0,+1],
-    [-1,-1,+2,+3 , +1,+1,-2,+2],
-    [+1,-2,+1,+3 , -1,+2,-1,+2],
-    [+2,-1,-1,+3 , -2,+1,+1,+2],
-    [+1,+1,-2,+3 , -1,-1,+2,+2],
-    [-1,+2,-1,+3 , +1,-2,+1,+2],
-    [-2,+1,+1,+3 , +2,-1,-1,+2],
-   ],'d'),
+'fcc': damask.lattice.kinematics['cF']['slip'][:12],
+'bcc': damask.lattice.kinematics['cI']['slip'],
+'hex': damask.lattice.kinematics['hP']['slip'],
 }
 
 # --------------------------------------------------------------------
@@ -156,11 +81,11 @@ elif options.lattice == 'hex':
     # convert 4 Miller index notation of hex to orthogonal 3 Miller index notation
     for i in range(len(slip_direction)):
         slip_direction[i] = np.array([slipSystems['hex'][i,0]*1.5,
-                                      (slipSystems['hex'][i,0] + 2.*slipSystems['hex'][i,1])*0.5*np.sqrt(3),
+                                     (slipSystems['hex'][i,0] + 2.*slipSystems['hex'][i,1])*0.5*np.sqrt(3),
                                       slipSystems['hex'][i,3]*options.CoverA,
                                      ])
         slip_normal[i]    = np.array([slipSystems['hex'][i,4],
-                                      (slipSystems['hex'][i,4] + 2.*slipSystems['hex'][i,5])/np.sqrt(3),
+                                     (slipSystems['hex'][i,4] + 2.*slipSystems['hex'][i,5])/np.sqrt(3),
                                       slipSystems['hex'][i,7]/options.CoverA,
                                      ])