From e89236b14d198dcbddc3f55b8fa13f319600ea64 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 8 Apr 2021 17:36:33 +0200 Subject: [PATCH] bugfix: don't overwrite data when doing a 'place-like' operation to merge datasets --- python/damask/_result.py | 2 +- python/tests/reference/Result/save_VTK/test_vtk[0-0-0].md5 | 2 +- python/tests/reference/Result/save_VTK/test_vtk[0-0-1].md5 | 2 +- python/tests/reference/Result/save_VTK/test_vtk[0-0-2].md5 | 2 +- python/tests/reference/Result/save_VTK/test_vtk[1-0-0].md5 | 2 +- python/tests/reference/Result/save_VTK/test_vtk[1-0-1].md5 | 2 +- python/tests/reference/Result/save_VTK/test_vtk[1-0-2].md5 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/damask/_result.py b/python/damask/_result.py index bf1b17876..89c704b94 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -1195,9 +1195,9 @@ class Result: for ty in ['phase','homogenization']: for field in self.visible['fields']: + outs = {} for label in self.visible[ty+'s']: if field not in f['/'.join([inc,ty,label])].keys(): continue - outs = {} for out in _match(output,f['/'.join([inc,ty,label,field])].keys()): data = ma.array(_read(f['/'.join([inc,ty,label,field,out])])) diff --git a/python/tests/reference/Result/save_VTK/test_vtk[0-0-0].md5 b/python/tests/reference/Result/save_VTK/test_vtk[0-0-0].md5 index c7fe1c66e..838037bb2 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[0-0-0].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[0-0-0].md5 @@ -1 +1 @@ -4ab2840cc5ba8d0b17a6fffb014b31a8 \ No newline at end of file +3b83384def67552ab7dd211efc0d54fd \ No newline at end of file diff --git a/python/tests/reference/Result/save_VTK/test_vtk[0-0-1].md5 b/python/tests/reference/Result/save_VTK/test_vtk[0-0-1].md5 index e4af3f438..7ceffc337 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[0-0-1].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[0-0-1].md5 @@ -1 +1 @@ -ff0f4079c18fcbb05fd08cf788230183 \ No newline at end of file +c32c86ed50dbb39a93ca2a2ebe47d9cb \ No newline at end of file diff --git a/python/tests/reference/Result/save_VTK/test_vtk[0-0-2].md5 b/python/tests/reference/Result/save_VTK/test_vtk[0-0-2].md5 index 678cbf390..f5b7daec3 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[0-0-2].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[0-0-2].md5 @@ -1 +1 @@ -3e72bea74635365e78a703254107ee07 \ No newline at end of file +ead4f6fcaff174fddc041d701e54ac60 \ No newline at end of file diff --git a/python/tests/reference/Result/save_VTK/test_vtk[1-0-0].md5 b/python/tests/reference/Result/save_VTK/test_vtk[1-0-0].md5 index 974866e6d..df00a513f 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[1-0-0].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[1-0-0].md5 @@ -1 +1 @@ -947f5fe28599a16cfb444b7371df2cae \ No newline at end of file +bde8b728110c2c05a6a4740f7c5f9c06 \ No newline at end of file diff --git a/python/tests/reference/Result/save_VTK/test_vtk[1-0-1].md5 b/python/tests/reference/Result/save_VTK/test_vtk[1-0-1].md5 index 0e9c5eb35..35c577900 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[1-0-1].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[1-0-1].md5 @@ -1 +1 @@ -76f4147d98999f131272a1d762fcf93c \ No newline at end of file +e09bfa9248283fc390003ad28d15d36e \ No newline at end of file diff --git a/python/tests/reference/Result/save_VTK/test_vtk[1-0-2].md5 b/python/tests/reference/Result/save_VTK/test_vtk[1-0-2].md5 index d3c633430..d5874d88b 100644 --- a/python/tests/reference/Result/save_VTK/test_vtk[1-0-2].md5 +++ b/python/tests/reference/Result/save_VTK/test_vtk[1-0-2].md5 @@ -1 +1 @@ -e76b8ecc66a516eccd6b3e15fc8adc66 \ No newline at end of file +3f21254164f96de8ee4a28249ae72cc6 \ No newline at end of file