From f9772a3df85bb7dbb2a5b3308c1443206e1650ca Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 13 Jan 2020 02:51:49 +0100 Subject: [PATCH] more descriptive name --- processing/post/addCompatibilityMismatch.py | 2 +- processing/post/addCurl.py | 2 +- processing/post/addDisplacement.py | 2 +- processing/post/addDivergence.py | 2 +- processing/post/addEuclideanDistance.py | 2 +- processing/post/addGradient.py | 2 +- processing/post/averageDown.py | 2 +- processing/post/blowUp.py | 2 +- processing/pre/geom_fromTable.py | 2 +- python/damask/grid_filters.py | 6 +++--- python/tests/test_grid_filters.py | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/processing/post/addCompatibilityMismatch.py b/processing/post/addCompatibilityMismatch.py index 29e874614..c7c5086ca 100755 --- a/processing/post/addCompatibilityMismatch.py +++ b/processing/post/addCompatibilityMismatch.py @@ -176,7 +176,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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) F = table.get(options.defgrad).reshape(grid[2],grid[1],grid[0],3,3) nodes = damask.grid_filters.node_coord(size,F) diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 25639dc7c..f106054b3 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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) for label in options.labels: field = table.get(label) diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index 59630a6c6..faabc795f 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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) 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 585ebb5a5..cb9486990 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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) for label in options.labels: field = table.get(label) diff --git a/processing/post/addEuclideanDistance.py b/processing/post/addEuclideanDistance.py index eaf91b894..be820220a 100755 --- a/processing/post/addEuclideanDistance.py +++ b/processing/post/addEuclideanDistance.py @@ -143,7 +143,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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) neighborhood = neighborhoods[options.neighborhood] diffToNeighbor = np.empty(list(grid+2)+[len(neighborhood)],'i') diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index 54b80ed26..8620c123b 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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) for label in options.labels: field = table.get(label) diff --git a/processing/post/averageDown.py b/processing/post/averageDown.py index cbd1f9637..0d3948251 100755 --- a/processing/post/averageDown.py +++ b/processing/post/averageDown.py @@ -65,7 +65,7 @@ for name in filenames: table = damask.Table.from_ASCII(StringIO(''.join(sys.stdin.read())) if name is None else name) if (options.grid is None or options.size is None): - grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) else: grid = np.array(options.grid,'i') size = np.array(options.size,'d') diff --git a/processing/post/blowUp.py b/processing/post/blowUp.py index 9cb6347ab..718858e1c 100755 --- a/processing/post/blowUp.py +++ b/processing/post/blowUp.py @@ -54,7 +54,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,origin = damask.grid_filters.cell_coord0_2_DNA(table.get(options.pos)) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.get(options.pos)) packing = np.array(options.packing,'i') outSize = grid*packing diff --git a/processing/pre/geom_fromTable.py b/processing/pre/geom_fromTable.py index 40fd17437..0879f8812 100755 --- a/processing/pre/geom_fromTable.py +++ b/processing/pre/geom_fromTable.py @@ -86,7 +86,7 @@ for name in filenames: if options.phase is None: table.data = np.column_stack((table.data,np.ones(len(table.data)))) # add single phase if no phase column given - grid,size,origin = damask.grid_filters.cell_coord0_2_DNA(table.data[:,0:3]) + grid,size,origin = damask.grid_filters.cell_coord0_gridSizeOrigin(table.data[:,0:3]) indices = np.lexsort((table.data[:,0],table.data[:,1],table.data[:,2])) # indices of position when sorting x fast, z slow microstructure = np.empty(grid,dtype = int) # initialize empty microstructure diff --git a/python/damask/grid_filters.py b/python/damask/grid_filters.py index 9c8b1b88e..36ce3b8e2 100644 --- a/python/damask/grid_filters.py +++ b/python/damask/grid_filters.py @@ -181,7 +181,7 @@ def cell_coord(size,F,origin=np.zeros(3)): """ return cell_coord0(F.shape[:3][::-1],size,origin) + cell_displacement(size,F) -def cell_coord0_2_DNA(coord0,ordered=True): +def cell_coord0_gridSizeOrigin(coord0,ordered=True): """ Return grid 'DNA', i.e. grid, size, and origin from array of cell positions. @@ -231,7 +231,7 @@ def coord0_check(coord0): array of undeformed cell coordinates. """ - cell_coord0_2_DNA(coord0,ordered=True) + cell_coord0_gridSizeOrigin(coord0,ordered=True) @@ -331,7 +331,7 @@ def node_2_cell(node_data): return c[:-1,:-1,:-1] -def node_coord0_2_DNA(coord0,ordered=False): +def node_coord0_gridSizeOrigin(coord0,ordered=False): """ Return grid 'DNA', i.e. grid, size, and origin from array of nodal positions. diff --git a/python/tests/test_grid_filters.py b/python/tests/test_grid_filters.py index fdddaf3a1..a5455e1ae 100644 --- a/python/tests/test_grid_filters.py +++ b/python/tests/test_grid_filters.py @@ -26,12 +26,12 @@ class TestGridFilters: @pytest.mark.parametrize('mode',[('cell'),('node')]) def test_grid_DNA(self,mode): - """Ensure that xx_coord0_2_DNA is the inverse of xx_coord0.""" + """Ensure that xx_coord0_gridSizeOrigin is the inverse of xx_coord0.""" grid = np.random.randint(8,32,(3)) size = np.random.random(3) origin = np.random.random(3) coord0 = eval('grid_filters.{}_coord0(grid,size,origin)'.format(mode)) # noqa - _grid,_size,_origin = eval('grid_filters.{}_coord0_2_DNA(coord0.reshape((-1,3)))'.format(mode)) + _grid,_size,_origin = eval('grid_filters.{}_coord0_gridSizeOrigin(coord0.reshape((-1,3)))'.format(mode)) assert np.allclose(grid,_grid) and np.allclose(size,_size) and np.allclose(origin,_origin) def test_displacement_fluct_equivalence(self):