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

[skip ci] renamed _add_generic_pointwise provided_func argument to callback

This commit is contained in:
1a2a34v 2022-04-28 09:45:10 +02:00
parent 793f4e22ba
commit 482db1ac3b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/damask/_result.py
View File

@ -1402,7 +1402,7 @@ class Result:
def _job_pointwise(self, def _job_pointwise(self,
group: str, group: str,
provided_func: Callable, callback: Callable,
datasets: Dict[str, str], datasets: Dict[str, str],
args: Dict[str, str], args: Dict[str, str],
lock: LockBase) -> List[Union[None, Any]]: lock: LockBase) -> List[Union[None, Any]]:
@ -1418,7 +1418,7 @@ class Result:
'meta': {k:(v.decode() if not h5py3 and type(v) is bytes else v) \ 'meta': {k:(v.decode() if not h5py3 and type(v) is bytes else v) \
for k,v in loc.attrs.items()}} for k,v in loc.attrs.items()}}
lock.release() lock.release()
r = provided_func(**datasets_in,**args) r = callback(**datasets_in,**args)
return [group,r] return [group,r]
except Exception as err: except Exception as err:
print(f'Error during calculation: {err}.') print(f'Error during calculation: {err}.')
@ -1433,7 +1433,7 @@ class Result:
Parameters Parameters
---------- ----------
func : function callback : function
Callback function that calculates a new dataset from one or Callback function that calculates a new dataset from one or
more datasets per HDF5 group. more datasets per HDF5 group.
datasets : dictionary datasets : dictionary
@ -1459,7 +1459,7 @@ class Result:
print('No matching dataset found, no data was added.') print('No matching dataset found, no data was added.')
return return
default_arg = partial(self._job_pointwise,provided_func=func,datasets=datasets,args=args,lock=lock) default_arg = partial(self._job_pointwise,callback=func,datasets=datasets,args=args,lock=lock)
for group,result in util.show_progress(pool.imap_unordered(default_arg,groups),len(groups)): #type: ignore for group,result in util.show_progress(pool.imap_unordered(default_arg,groups),len(groups)): #type: ignore
if not result: if not result: