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

avoid invalid DADF5

This commit is contained in:
Martin Diehl 2021-08-16 21:31:17 +02:00
parent b79fc5c097
commit b13e7e174b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/damask/_result.py
View File

@ -567,9 +567,13 @@ class Result:
formula = kwargs['formula'] formula = kwargs['formula']
for d in re.findall(r'#(.*?)#',formula): for d in re.findall(r'#(.*?)#',formula):
formula = formula.replace(f'#{d}#',f"kwargs['{d}']['data']") formula = formula.replace(f'#{d}#',f"kwargs['{d}']['data']")
data = eval(formula)
if not hasattr(data,'shape') or data.shape[0] != kwargs[d]['data'].shape[0]:
raise ValueError("'{}' results in invalid shape".format(kwargs['formula']))
return { return {
'data': eval(formula), 'data': data,
'label': kwargs['label'], 'label': kwargs['label'],
'meta': { 'meta': {
'unit': kwargs['unit'], 'unit': kwargs['unit'],

4
python/tests/test_Result.py
View File

@ -123,6 +123,10 @@ class TestResult:
in_file = default.place('x') in_file = default.place('x')
assert np.allclose(in_memory,in_file) assert np.allclose(in_memory,in_file)
def test_add_calculation_invalid(self,default):
default.add_calculation('np.linalg.norm(#F#,axis=0)','wrong_dim')
assert default.get('wrong_dim') is None
def test_add_stress_Cauchy(self,default): def test_add_stress_Cauchy(self,default):
default.add_stress_Cauchy('P','F') default.add_stress_Cauchy('P','F')
in_memory = mechanics.stress_Cauchy(default.place('P'), default.place('F')) in_memory = mechanics.stress_Cauchy(default.place('P'), default.place('F'))