From c60d9cde2ad8be28a3574d942716e6135b47d09f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 18 Nov 2020 15:52:55 +0100 Subject: [PATCH] merge 'mechanics' datasets was like that for 'generic'. Needs detailed discussion in future --- python/damask/_result.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/damask/_result.py b/python/damask/_result.py index 7ed2310d9..cb69c0dbb 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -1249,7 +1249,7 @@ class Result: self.pick('homogenizations',False) for label in (labels if isinstance(labels,list) else [labels]): for p in self.iterate('out_type_ph'): - if p != 'generic': + if p != 'mechanics': for c in self.iterate('phases'): x = self.get_dataset_location(label) if len(x) == 0: @@ -1261,7 +1261,7 @@ class Result: if len(x) == 0: continue 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 v.add(array,dset_name) self.pick('homogenizations',picked_backup_ho) @@ -1270,7 +1270,7 @@ class Result: self.pick('phases',False) for label in (labels if isinstance(labels,list) else [labels]): for p in self.iterate('out_type_ho'): - if p != 'generic': + if p != 'mechanics': for m in self.iterate('homogenizations'): x = self.get_dataset_location(label) if len(x) == 0: