223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

polishing

This commit is contained in:
Martin Diehl 2019-10-01 14:30:09 -07:00
parent e96eb55edd
commit 62fb4d2ea9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/damask/dadf5.py
View File

@ -543,7 +543,7 @@ class DADF5():
'label' : kwargs['label'], 'label' : kwargs['label'],
'meta' : { 'meta' : {
'Unit' : kwargs['unit'], 'Unit' : kwargs['unit'],
'Description' : '{}'.format(kwargs['description']), 'Description' : '{} (formula: {})'.format(kwargs['description'],kwargs['formula']),
'Creator' : 'dadf5.py:add_calculation v{}'.format(version) 'Creator' : 'dadf5.py:add_calculation v{}'.format(version)
} }
} }
@ -580,7 +580,7 @@ class DADF5():
(U,S,Vh) = np.linalg.svd(defgrad['data']) # singular value decomposition (U,S,Vh) = np.linalg.svd(defgrad['data']) # singular value decomposition
R_inv = np.transpose(np.matmul(U,Vh),(0,2,1)) # transposed rotation of polar decomposition R_inv = np.transpose(np.matmul(U,Vh),(0,2,1)) # transposed rotation of polar decomposition
s = np.matmul(R_inv,defgrad['data']) if stretch == 'U' else \ s = np.matmul(R_inv,defgrad['data']) if stretch == 'U' else \
np.matmul(defgrad['data'],R_inv) np.matmul(defgrad['data'],R_inv) # compute either left or right stretch
(D,V) = np.linalg.eigh((s+np.transpose(s,(0,2,1)))*.5) # eigen decomposition (of symmetric(ed) matrix) (D,V) = np.linalg.eigh((s+np.transpose(s,(0,2,1)))*.5) # eigen decomposition (of symmetric(ed) matrix)
d = operator[stretch+'#'+{0:'ln',1:'Biot',2:'Green'}[ord]](D) d = operator[stretch+'#'+{0:'ln',1:'Biot',2:'Green'}[ord]](D)