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

0-based material indices

This commit is contained in:
Martin Diehl 2020-10-28 09:31:55 +01:00
parent c3a413e023
commit 5f03e8cf8f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/damask/_geom.py
View File

@ -417,7 +417,7 @@ class Geom:
Number of periods per unit cell. Defaults to 1. Number of periods per unit cell. Defaults to 1.
materials : (int, int), optional materials : (int, int), optional
Material IDs. Defaults to (1,2). Material IDs. Defaults to (1,2).
Notes Notes
----- -----
The following triply-periodic minimal surfaces are implemented: The following triply-periodic minimal surfaces are implemented:
@ -687,10 +687,10 @@ class Geom:
def renumber(self): def renumber(self):
"""Renumber sorted material indices to 1,...,N.""" """Renumber sorted material indices to 0,...,N-1."""
renumbered = np.empty(self.grid,dtype=self.material.dtype) renumbered = np.empty(self.grid,dtype=self.material.dtype)
for i, oldID in enumerate(np.unique(self.material)): for i, oldID in enumerate(np.unique(self.material)):
renumbered = np.where(self.material == oldID, i+1, renumbered) renumbered = np.where(self.material == oldID, i, renumbered)
return Geom(material = renumbered, return Geom(material = renumbered,
size = self.size, size = self.size,

1
python/tests/test_Geom.py
View File

@ -176,6 +176,7 @@ class TestGeom:
material = default.material.copy() material = default.material.copy()
for m in np.unique(material): for m in np.unique(material):
material[material==m] = material.max() + np.random.randint(1,30) material[material==m] = material.max() + np.random.randint(1,30)
default.material -= 1
modified = Geom(material, modified = Geom(material,
default.size, default.size,
default.origin) default.origin)