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

Merge branch 'grid-filters' into MiscImprovements

This commit is contained in:
Martin Diehl 2019-12-21 17:39:39 +01:00
parent dd318c8d1d 503626473a
commit 3bf9a4deb5
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/grid_filters.py
View File

@ -147,7 +147,7 @@ def cell_displacement_avg(size,F):
""" """
F_avg = np.average(F,axis=(0,1,2)) F_avg = np.average(F,axis=(0,1,2))
return np.einsum('ml,ijkl->ijkm',F_avg-np.eye(3),cell_coord0(F.shape[:3],size)) return np.einsum('ml,ijkl->ijkm',F_avg-np.eye(3),cell_coord0(F.shape[:3][::-1],size))
def cell_coord0_2_DNA(coord0,ordered=True): def cell_coord0_2_DNA(coord0,ordered=True):
""" """
@ -232,7 +232,7 @@ def node_displacement_avg(size,F):
""" """
F_avg = np.average(F,axis=(0,1,2)) F_avg = np.average(F,axis=(0,1,2))
return np.einsum('ml,ijkl->ijkm',F_avg-np.eye(3),node_coord0(F.shape[:3],size)) return np.einsum('ml,ijkl->ijkm',F_avg-np.eye(3),node_coord0(F.shape[:3][::-1],size))
def cell_2_node(cell_data): def cell_2_node(cell_data):