diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 010d24935..5db47ce04 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -44,7 +44,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - grid,size = damask.util.coordGridAndSize(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos),True) for label in options.labels: field = table.get(label) diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index 4f0323504..735e6d875 100755 --- a/processing/post/addDisplacement.py +++ b/processing/post/addDisplacement.py @@ -50,7 +50,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - grid,size = damask.util.coordGridAndSize(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos),True) F = table.get(options.f).reshape(np.append(grid[::-1],(3,3))) if options.nodal: diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index d2d68ede6..ea4b134a4 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -44,7 +44,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - grid,size = damask.util.coordGridAndSize(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos),True) for label in options.labels: field = table.get(label) diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index ed9397f02..75109a3e0 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -44,7 +44,7 @@ for name in filenames: damask.util.report(scriptName,name) table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) - grid,size = damask.util.coordGridAndSize(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos),True) for label in options.labels: field = table.get(label) diff --git a/python/damask/grid_filters.py b/python/damask/grid_filters.py index cb593f449..96ae226dd 100644 --- a/python/damask/grid_filters.py +++ b/python/damask/grid_filters.py @@ -102,7 +102,7 @@ def cell_coord0_2_DNA(coord0,ordered=False): raise ValueError('Data count {} does not match grid {}.'.format(len(coord0),grid)) start = origin + delta*.5 - end = origin + size -delta*.5 + end = origin - delta*.5 + size if not np.allclose(coords[0],np.linspace(start[0],end[0],grid[0])) and \ np.allclose(coords[1],np.linspace(start[1],end[1],grid[1])) and \