From 62fb4d2ea978f2dd963b3e2081dbf368bf7dd8fa Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 1 Oct 2019 14:30:09 -0700 Subject: [PATCH] polishing --- python/damask/dadf5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/damask/dadf5.py b/python/damask/dadf5.py index c326002dc..43871742d 100644 --- a/python/damask/dadf5.py +++ b/python/damask/dadf5.py @@ -543,7 +543,7 @@ class DADF5(): 'label' : kwargs['label'], 'meta' : { 'Unit' : kwargs['unit'], - 'Description' : '{}'.format(kwargs['description']), + 'Description' : '{} (formula: {})'.format(kwargs['description'],kwargs['formula']), '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 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 \ - 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 = operator[stretch+'#'+{0:'ln',1:'Biot',2:'Green'}[ord]](D)