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

better name 

backport from dadf5-usability branch
This commit is contained in:
Martin Diehl 2020-02-21 12:20:42 +01:00
parent c1caef4bc9
commit 16ddd9c5b2
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
python/damask/dadf5.py
View File

@ -73,11 +73,11 @@ class DADF5():
self.mat_physics += f['/'.join([self.increments[0],'materialpoint',m])].keys() self.mat_physics += f['/'.join([self.increments[0],'materialpoint',m])].keys()
self.mat_physics = list(set(self.mat_physics)) # make unique self.mat_physics = list(set(self.mat_physics)) # make unique
self.visible= {'increments': self.increments, self.selection= {'increments': self.increments,
'constituents': self.constituents, 'constituents': self.constituents,
'materialpoints': self.materialpoints, 'materialpoints': self.materialpoints,
'con_physics': self.con_physics, 'con_physics': self.con_physics,
'mat_physics': self.mat_physics} 'mat_physics': self.mat_physics}
self.fname = fname self.fname = fname
@ -92,7 +92,7 @@ class DADF5():
name of datasets as list, supports ? and * wildcards. name of datasets as list, supports ? and * wildcards.
True is equivalent to [*], False is equivalent to [] True is equivalent to [*], False is equivalent to []
what : str what : str
attribute to change (must be in self.visible) attribute to change (must be in self.selection)
action : str action : str
select from 'set', 'add', and 'del' select from 'set', 'add', and 'del'
@ -105,14 +105,14 @@ class DADF5():
choice = [datasets] if isinstance(datasets,str) else datasets choice = [datasets] if isinstance(datasets,str) else datasets
valid = [e for e_ in [glob.fnmatch.filter(getattr(self,what),s) for s in choice] for e in e_] valid = [e for e_ in [glob.fnmatch.filter(getattr(self,what),s) for s in choice] for e in e_]
existing = set(self.visible[what]) existing = set(self.selection[what])
if action == 'set': if action == 'set':
self.visible[what] = valid self.selection[what] = valid
elif action == 'add': elif action == 'add':
self.visible[what] = list(existing.union(valid)) self.selection[what] = list(existing.union(valid))
elif action == 'del': elif action == 'del':
self.visible[what] = list(existing.difference_update(valid)) self.selection[what] = list(existing.difference_update(valid))
def __time_to_inc(self,start,end): def __time_to_inc(self,start,end):
@ -229,17 +229,17 @@ class DADF5():
Parameters Parameters
---------- ----------
what : str what : str
attribute to change (must be in self.visible) attribute to change (must be in self.selection)
""" """
datasets = self.visible[what] datasets = self.selection[what]
last_datasets = datasets.copy() last_datasets = datasets.copy()
for dataset in datasets: for dataset in datasets:
if last_datasets != self.visible[what]: if last_datasets != self.selection[what]:
self.__manage_visible(datasets,what,'set') self.__manage_visible(datasets,what,'set')
raise Exception raise Exception
self.__manage_visible(dataset,what,'set') self.__manage_visible(dataset,what,'set')
last_datasets = self.visible[what] last_datasets = self.selection[what]
yield dataset yield dataset
self.__manage_visible(datasets,what,'set') self.__manage_visible(datasets,what,'set')
@ -254,7 +254,7 @@ class DADF5():
name of datasets as list, supports ? and * wildcards. name of datasets as list, supports ? and * wildcards.
True is equivalent to [*], False is equivalent to [] True is equivalent to [*], False is equivalent to []
what : str what : str
attribute to change (must be in self.visible) attribute to change (must be in self.selection)
""" """
self.__manage_visible(datasets,what,'set') self.__manage_visible(datasets,what,'set')
@ -270,7 +270,7 @@ class DADF5():
name of datasets as list, supports ? and * wildcards. name of datasets as list, supports ? and * wildcards.
True is equivalent to [*], False is equivalent to [] True is equivalent to [*], False is equivalent to []
what : str what : str
attribute to change (must be in self.visible) attribute to change (must be in self.selection)
""" """
self.__manage_visible(datasets,what,'add') self.__manage_visible(datasets,what,'add')
@ -286,7 +286,7 @@ class DADF5():
name of datasets as list, supports ? and * wildcards. name of datasets as list, supports ? and * wildcards.
True is equivalent to [*], False is equivalent to [] True is equivalent to [*], False is equivalent to []
what : str what : str
attribute to change (must be in self.visible) attribute to change (must be in self.selection)
""" """
self.__manage_visible(datasets,what,'del') self.__manage_visible(datasets,what,'del')
@ -1094,7 +1094,7 @@ class DADF5():
for i,inc in enumerate(self.iter_visible('increments')): for i,inc in enumerate(self.iter_visible('increments')):
vtk_data = [] vtk_data = []
materialpoints_backup = self.visible['materialpoints'].copy() materialpoints_backup = self.selection['materialpoints'].copy()
self.set_visible('materialpoints',False) self.set_visible('materialpoints',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.iter_visible('con_physics'): for p in self.iter_visible('con_physics'):
@ -1125,7 +1125,7 @@ class DADF5():
self.set_visible('materialpoints',materialpoints_backup) self.set_visible('materialpoints',materialpoints_backup)
constituents_backup = self.visible['constituents'].copy() constituents_backup = self.selection['constituents'].copy()
self.set_visible('constituents',False) self.set_visible('constituents',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.iter_visible('mat_physics'): for p in self.iter_visible('mat_physics'):