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

simplified

This commit is contained in:
Martin Diehl 2021-04-01 14:56:17 +02:00
parent 4b9fcf2f77
commit 71d1a341e4
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
python/damask/_result.py
View File

@ -1354,27 +1354,20 @@ class Result:
for inc in util.show_progress(self.visible['increments']): for inc in util.show_progress(self.visible['increments']):
r[inc] = {'phase':{},'homogenization':{},'geometry':{}} r[inc] = {'phase':{},'homogenization':{},'geometry':{}}
for la in labels_.intersection(f[os.path.join(inc,'geometry')].keys()): for la in labels_.intersection(f['/'.join((inc,'geometry'))].keys()):
r[inc]['geometry'][la] = _read(f,os.path.join(inc,'geometry',la)) r[inc]['geometry'][la] = _read(f,'/'.join((inc,'geometry',la)))
for ph in self.visible['phases']: for ty in ['phase','homogenization']:
r[inc]['phase'][ph] = {} for na in self.visible[ty+'s']:
for field in f[os.path.join(inc,'phase',ph)].keys(): r[inc][ty][na] = {}
r[inc]['phase'][ph][field] = {} for field in f['/'.join((inc,ty,na))].keys():
for la in labels_.intersection(f[os.path.join(inc,'phase',ph,field)].keys()): r[inc][ty][na][field] = {}
r[inc]['phase'][ph][field][la] = \ for la in labels_.intersection(f['/'.join((inc,ty,na,field))].keys()):
_read(f,os.path.join(inc,'phase',ph,field,la)) r[inc][ty][na][field][la] = _read(f,'/'.join((inc,ty,na,field,la)))
for ho in self.visible['homogenizations']:
r[inc]['homogenization'][ho] = {}
for field in f[os.path.join(inc,'homogenization',ho)].keys():
r[inc]['homogenization'][ho][field] = {}
for la in labels_.intersection(f[os.path.join(inc,'homogenization',ho,field)].keys()):
r[inc]['homogenization'][ho][field][la] = \
_read(f,os.path.join(inc,'homogenization',ho,field,la))
if strip: r = util.dict_strip(r) if strip: r = util.dict_strip(r)
if compress: r = util.dict_compress(r) if compress: r = util.dict_compress(r)
return r return r