functionality to sort material id
convenient for layered materials
This commit is contained in:
parent
fce116aa8b
commit
0ebb9b611d
|
@ -800,6 +800,20 @@ class Geom:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def sort(self):
|
||||||
|
"""Sort material indices such that min(material) is located at (0,0,0)."""
|
||||||
|
a = self.material.flatten(order='F')
|
||||||
|
from_ma = pd.unique(a)
|
||||||
|
sort_idx = np.argsort(from_ma)
|
||||||
|
ma = np.unique(a)[sort_idx][np.searchsorted(from_ma,a,sorter = sort_idx)]
|
||||||
|
|
||||||
|
return Geom(material = ma.reshape(self.grid,order='F'),
|
||||||
|
size = self.size,
|
||||||
|
origin = self.origin,
|
||||||
|
comments = self.comments+[util.execution_stamp('Geom','sort')],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def vicinity_offset(self,vicinity=1,offset=None,trigger=[],periodic=True):
|
def vicinity_offset(self,vicinity=1,offset=None,trigger=[],periodic=True):
|
||||||
"""
|
"""
|
||||||
Offset material index of points in the vicinity of xxx.
|
Offset material index of points in the vicinity of xxx.
|
||||||
|
|
|
@ -6,6 +6,7 @@ from damask import Geom
|
||||||
from damask import Table
|
from damask import Table
|
||||||
from damask import Rotation
|
from damask import Rotation
|
||||||
from damask import util
|
from damask import util
|
||||||
|
from damask import seeds
|
||||||
from damask import grid_filters
|
from damask import grid_filters
|
||||||
|
|
||||||
|
|
||||||
|
@ -204,6 +205,12 @@ class TestGeom:
|
||||||
assert np.array_equiv(t,f) or (not geom_equal(modified,default))
|
assert np.array_equiv(t,f) or (not geom_equal(modified,default))
|
||||||
assert geom_equal(default, modified.substitute(t,f))
|
assert geom_equal(default, modified.substitute(t,f))
|
||||||
|
|
||||||
|
def test_sort(self):
|
||||||
|
grid = np.random.randint(5,20,3)
|
||||||
|
m = Geom(np.random.randint(1,20,grid)*3,np.ones(3)).sort().material.flatten(order='F')
|
||||||
|
assert m[0] == m.min()
|
||||||
|
for i,v in enumerate(m[1:]):
|
||||||
|
assert v > m[:i+1].max() or v in m[:i+1]
|
||||||
|
|
||||||
@pytest.mark.parametrize('axis_angle',[np.array([1,0,0,86.7]), np.array([0,1,0,90.4]), np.array([0,0,1,90]),
|
@pytest.mark.parametrize('axis_angle',[np.array([1,0,0,86.7]), np.array([0,1,0,90.4]), np.array([0,0,1,90]),
|
||||||
np.array([1,0,0,175]),np.array([0,-1,0,178]),np.array([0,0,1,180])])
|
np.array([1,0,0,175]),np.array([0,-1,0,178]),np.array([0,0,1,180])])
|
||||||
|
@ -384,3 +391,13 @@ class TestGeom:
|
||||||
t = Table(np.column_stack((coords,z)),{'coords':3,'z':1})
|
t = Table(np.column_stack((coords,z)),{'coords':3,'z':1})
|
||||||
g = Geom.from_table(t,'coords',['1_coords','z'])
|
g = Geom.from_table(t,'coords',['1_coords','z'])
|
||||||
assert g.N_materials == g.grid[0]*2 and (g.material[:,:,-1]-g.material[:,:,0] == grid[0]).all()
|
assert g.N_materials == g.grid[0]*2 and (g.material[:,:,-1]-g.material[:,:,0] == grid[0]).all()
|
||||||
|
|
||||||
|
|
||||||
|
def test_from_table_recover(self,tmp_path):
|
||||||
|
grid = np.random.randint(60,100,3)
|
||||||
|
size = np.ones(3)+np.random.rand(3)
|
||||||
|
s = seeds.from_random(size,np.random.randint(60,100))
|
||||||
|
geom = Geom.from_Voronoi_tessellation(grid,size,s)
|
||||||
|
coords = grid_filters.cell_coord0(grid,size)
|
||||||
|
t = Table(np.column_stack((coords.reshape(-1,3,order='F'),geom.material.flatten(order='F'))),{'c':3,'m':1})
|
||||||
|
assert geom_equal(geom.sort().renumber(),Geom.from_table(t,'c',['m']))
|
||||||
|
|
Loading…
Reference in New Issue