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

copy and paste error/invalid syntax

This commit is contained in:
Martin Diehl 2019-10-18 20:56:38 +02:00
parent 5858d03a6b
commit dc9aca5710
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/damask/dadf5.py
View File

@ -381,7 +381,7 @@ class DADF5():
""" """
def Cauchy(F,P): def Cauchy(F,P):
return { return {
'data' : mechanics.Cauchy(F['data']),P['data']), 'data' : mechanics.Cauchy(F['data'],P['data']),
'label' : 'sigma', 'label' : 'sigma',
'meta' : { 'meta' : {
'Unit' : P['meta']['Unit'], 'Unit' : P['meta']['Unit'],

2
python/damask/mechanics.py
View File

@ -13,7 +13,7 @@ def deviator(x):
if np.shape(x) == (3,3): if np.shape(x) == (3,3):
return x - np.eye(3)*np.trace(x)/3.0 return x - np.eye(3)*np.trace(x)/3.0
else: else:
return d - np.einsum('ijk,i->ijk',np.broadcast_to(np.eye(3),[d.shape[0],3,3]),np.trace(d,axis1=1,axis2=2)/3.0) return x - np.einsum('ijk,i->ijk',np.broadcast_to(np.eye(3),[x.shape[0],3,3]),np.trace(x,axis1=1,axis2=2)/3.0)
def spherical(x): def spherical(x):