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

homogenize: (material index, material ID) -> material ID 

mutable describes meaning of parameter better
This commit is contained in:
Martin Diehl 2022-02-26 14:22:00 +01:00
parent 3ee0434836
commit a314e63ed2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
python/damask/_grid.py
View File

@ -907,17 +907,17 @@ class Grid:
def clean(self, def clean(self,
stencil: int = 3, stencil: int = 3,
selection: IntSequence = None, mutable: IntSequence = None,
periodic: bool = True) -> 'Grid': periodic: bool = True) -> 'Grid':
""" """
Smooth grid by selecting most frequent material index within given stencil at each location. Smooth grid by selecting most frequent material ID within given stencil at each location.
Parameters Parameters
---------- ----------
stencil : int, optional stencil : int, optional
Size of smoothing stencil. Size of smoothing stencil. Defaults to 3.
selection : sequence of int, optional mutable : sequence of int, optional
Field values that can be altered. Defaults to all. Material ID that can be altered. Defaults to all.
periodic : bool, optional periodic : bool, optional
Assume grid to be periodic. Defaults to True. Assume grid to be periodic. Defaults to True.
@ -927,9 +927,9 @@ class Grid:
Updated grid-based geometry. Updated grid-based geometry.
""" """
def mostFrequent(arr: np.ndarray, selection = None): def mostFrequent(arr: np.ndarray, mutable = None):
me = arr[arr.size//2] me = arr[arr.size//2]
if selection is None or me in selection: if selection is None or me in mutable:
unique, inverse = np.unique(arr, return_inverse=True) unique, inverse = np.unique(arr, return_inverse=True)
return unique[np.argmax(np.bincount(inverse))] return unique[np.argmax(np.bincount(inverse))]
else: else:
@ -938,9 +938,9 @@ class Grid:
return Grid(material = ndimage.filters.generic_filter( return Grid(material = ndimage.filters.generic_filter(
self.material, self.material,
mostFrequent, mostFrequent,
size=(stencil if selection is None else stencil//2*2+1,)*3, size=(stencil if mutable is None else stencil//2*2+1,)*3,
mode=('wrap' if periodic else 'nearest'), mode=('wrap' if periodic else 'nearest'),
extra_keywords=dict(selection=selection), extra_keywords=dict(mutable=mutable),
).astype(self.material.dtype), ).astype(self.material.dtype),
size = self.size, size = self.size,
origin = self.origin, origin = self.origin,
@ -978,7 +978,7 @@ class Grid:
R : damask.Rotation R : damask.Rotation
Rotation to apply to the grid. Rotation to apply to the grid.
fill : int, optional fill : int, optional
Material index to fill the corners. Defaults to material.max() + 1. Material ID to fill the corners. Defaults to material.max() + 1.
Returns Returns
------- -------
@ -1020,7 +1020,7 @@ class Grid:
offset : sequence of int, len (3), optional offset : sequence of int, len (3), optional
Offset (measured in cells) from old to new grid [0,0,0]. Offset (measured in cells) from old to new grid [0,0,0].
fill : int, optional fill : int, optional
Material index to fill the background. Defaults to material.max() + 1. Material ID to fill the background. Defaults to material.max() + 1.
Returns Returns
------- -------
@ -1118,7 +1118,7 @@ class Grid:
trigger: IntSequence = [], trigger: IntSequence = [],
periodic: bool = True) -> 'Grid': periodic: bool = True) -> 'Grid':
""" """
Offset material index of points in the vicinity of xxx. Offset material ID of points in the vicinity of xxx.
Different from themselves (or listed as triggers) within a given (cubic) vicinity, Different from themselves (or listed as triggers) within a given (cubic) vicinity,
i.e. within the region close to a grain/phase boundary. i.e. within the region close to a grain/phase boundary.