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

keep order of unique values found in table

This commit is contained in:
Martin Diehl 2020-10-28 11:41:34 +01:00
parent b38a498197
commit d72343c865
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 1e8c66897820468ab46958d995005e2b69204d0e Subproject commit 3112a4dbfa1e926c07b7f9443161239b8a7e85ca

21
python/damask/_geom.py
View File

@ -4,6 +4,7 @@ from functools import partial
from os import path from os import path
import numpy as np import numpy as np
import pandas as pd
import h5py import h5py
from scipy import ndimage,spatial from scipy import ndimage,spatial
@ -260,15 +261,19 @@ class Geom:
Each unique combintation of values results in a material. Each unique combintation of values results in a material.
""" """
t = table.sort_by([f'{i}_{coordinates}' for i in range(3,0,-1)]) coords = table.sort_by([f'{i}_{coordinates}' for i in range(3,0,-1)]).get(coordinates)
grid,size,origin = grid_filters.cell_coord0_gridSizeOrigin(coords)
grid,size,origin = grid_filters.cell_coord0_gridSizeOrigin(t.get(coordinates))
labels_ = [labels] if isinstance(labels,str) else labels labels_ = [labels] if isinstance(labels,str) else labels
_,unique_inverse = np.unique(np.hstack([t.get(l) for l in labels_]),return_inverse=True,axis=0) unique,unique_inverse = np.unique(np.hstack([table.get(l) for l in labels_]),return_inverse=True,axis=0)
ma = unique_inverse.reshape(grid,order='F') + 1 if len(unique) == grid.prod():
ma = np.arange(grid.prod())
else:
ma = np.empty(grid.prod(),'i')
for to_ma,from_ma in enumerate(pd.unique(unique_inverse)):
ma[unique_inverse==from_ma] = to_ma
return Geom(ma,size,origin,util.execution_stamp('Geom','from_table')) return Geom(ma.reshape(grid,order='F'),size,origin,util.execution_stamp('Geom','from_table'))
@staticmethod @staticmethod
@ -782,8 +787,8 @@ class Geom:
""" """
substituted = self.material.copy() substituted = self.material.copy()
for from_ms,to_ms in zip(from_material,to_material): for from_ma,to_ma in zip(from_material,to_material):
substituted[self.material==from_ms] = to_ms substituted[self.material==from_ma] = to_ma
return Geom(material = substituted, return Geom(material = substituted,
size = self.size, size = self.size,