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

Merge branch 'expanduser' into 'development' 

allow to use '~' in filenames

See merge request damask/DAMASK!552
This commit is contained in:
Daniel Otto de Mentock 2022-03-24 11:28:08 +00:00
parent 4b5cc2a7bc 135f2e7add
commit fab34d5c3a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/damask/_config.py
View File

@ -144,7 +144,7 @@ class Config(dict):
Configuration from file. Configuration from file.
""" """
fhandle = open(fname) if isinstance(fname, (str, Path)) else \ fhandle = open(Path(fname).expanduser()) if isinstance(fname, (str, Path)) else \
fname fname
return cls(yaml.safe_load(fhandle)) return cls(yaml.safe_load(fhandle))
@ -163,7 +163,7 @@ class Config(dict):
Keyword arguments parsed to yaml.dump. Keyword arguments parsed to yaml.dump.
""" """
fhandle = open(fname,'w',newline='\n') if isinstance(fname, (str, Path)) else \ fhandle = open(Path(fname).expanduser(),'w',newline='\n') if isinstance(fname, (str, Path)) else \
fname fname
if 'width' not in kwargs: if 'width' not in kwargs:

4
python/damask/util.py
View File

@ -587,7 +587,7 @@ def DREAM3D_base_group(fname: Union[str, Path]) -> str:
Path to the base group. Path to the base group.
""" """
with h5py.File(fname,'r') as f: with h5py.File(Path(fname).expanduser(),'r') as f:
base_group = f.visit(lambda path: path.rsplit('/',2)[0] if '_SIMPL_GEOMETRY/SPACING' in path else None) base_group = f.visit(lambda path: path.rsplit('/',2)[0] if '_SIMPL_GEOMETRY/SPACING' in path else None)
if base_group is None: if base_group is None:
@ -615,7 +615,7 @@ def DREAM3D_cell_data_group(fname: Union[str, Path]) -> str:
""" """
base_group = DREAM3D_base_group(fname) base_group = DREAM3D_base_group(fname)
with h5py.File(fname,'r') as f: with h5py.File(Path(fname).expanduser(),'r') as f:
cells = tuple(f['/'.join([base_group,'_SIMPL_GEOMETRY','DIMENSIONS'])][()][::-1]) cells = tuple(f['/'.join([base_group,'_SIMPL_GEOMETRY','DIMENSIONS'])][()][::-1])
cell_data_group = f[base_group].visititems(lambda path,obj: path.split('/')[0] \ cell_data_group = f[base_group].visititems(lambda path,obj: path.split('/')[0] \
if isinstance(obj,h5py._hl.dataset.Dataset) and np.shape(obj)[:-1] == cells \ if isinstance(obj,h5py._hl.dataset.Dataset) and np.shape(obj)[:-1] == cells \