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

merge 'mechanics' datasets 

was like that for 'generic'. Needs detailed discussion in future
This commit is contained in:
Martin Diehl 2020-11-18 15:52:55 +01:00
parent 838a4ea592
commit c60d9cde2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/damask/_result.py
View File

@ -1249,7 +1249,7 @@ class Result:
self.pick('homogenizations',False) self.pick('homogenizations',False)
for label in (labels if isinstance(labels,list) else [labels]): for label in (labels if isinstance(labels,list) else [labels]):
for p in self.iterate('out_type_ph'): for p in self.iterate('out_type_ph'):
if p != 'generic': if p != 'mechanics':
for c in self.iterate('phases'): for c in self.iterate('phases'):
x = self.get_dataset_location(label) x = self.get_dataset_location(label)
if len(x) == 0: if len(x) == 0:
@ -1261,7 +1261,7 @@ class Result:
if len(x) == 0: if len(x) == 0:
continue continue
array = self.read_dataset(x,0) array = self.read_dataset(x,0)
ph_name = re.compile(r'(?<=(phase\/))(.*?)(?=(generic))') # identify phase name ph_name = re.compile(r'(?<=(phase\/))(.*?)(?=(mechanics))') # identify phase name
dset_name = '1_' + re.sub(ph_name,r'',x[0].split('/',1)[1]) # removing phase name dset_name = '1_' + re.sub(ph_name,r'',x[0].split('/',1)[1]) # removing phase name
v.add(array,dset_name) v.add(array,dset_name)
self.pick('homogenizations',picked_backup_ho) self.pick('homogenizations',picked_backup_ho)
@ -1270,7 +1270,7 @@ class Result:
self.pick('phases',False) self.pick('phases',False)
for label in (labels if isinstance(labels,list) else [labels]): for label in (labels if isinstance(labels,list) else [labels]):
for p in self.iterate('out_type_ho'): for p in self.iterate('out_type_ho'):
if p != 'generic': if p != 'mechanics':
for m in self.iterate('homogenizations'): for m in self.iterate('homogenizations'):
x = self.get_dataset_location(label) x = self.get_dataset_location(label)
if len(x) == 0: if len(x) == 0: