diff --git a/python/damask/_result.py b/python/damask/_result.py index d73c678d8..e2103d802 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -98,7 +98,7 @@ class Result: self.version_major = f.attrs['DADF5_version_major'] self.version_minor = f.attrs['DADF5_version_minor'] - if self.version_major != 0 or not 12 <= self.version_minor <= 12: + if self.version_major != 0 or not 12 <= self.version_minor <= 13: raise TypeError(f'Unsupported DADF5 version {self.version_major}.{self.version_minor}') self.structured = 'cells' in f['geometry'].attrs.keys() @@ -1407,6 +1407,7 @@ class Result: v = self.geometry0 elif mode.lower()=='point': v = VTK.from_poly_data(self.coordinates0_point) + v.set_comments(util.execution_stamp('Result','save_VTK')) N_digits = int(np.floor(np.log10(max(1,int(self.increments[-1][10:])))))+1 @@ -1419,6 +1420,10 @@ class Result: at_cell_ph,in_data_ph,at_cell_ho,in_data_ho = self._mappings() with h5py.File(self.fname,'r') as f: + if self.version_minor >= 13: + creator = f.attrs['creator'] if h5py3 else f.attrs['creator'].decode() + created = f.attrs['created'] if h5py3 else f.attrs['created'].decode() + v.add_comments(f'{creator} ({created})') for inc in util.show_progress(self.visible['increments']): diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 index 9fa9006ad..1d914f8bb 100644 Binary files a/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 and b/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 differ 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 838037bb2..2d6393540 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 @@ -3b83384def67552ab7dd211efc0d54fd \ No newline at end of file +0f68c932b85aac1d30e03e05a16c4605 \ 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 7ceffc337..9ef213fd3 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 @@ -c32c86ed50dbb39a93ca2a2ebe47d9cb \ No newline at end of file +b206ef9e7a096586c7d71d58fc7278bd \ 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 f5b7daec3..d1f08336d 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 @@ -ead4f6fcaff174fddc041d701e54ac60 \ No newline at end of file +11bd422f0a6c78ee1d3c939b1fccf1ee \ 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 df00a513f..2f7077569 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 @@ -bde8b728110c2c05a6a4740f7c5f9c06 \ No newline at end of file +541f423cfde8e2a98582491f7af3add5 \ 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 35c577900..e1c35f93d 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 @@ -e09bfa9248283fc390003ad28d15d36e \ No newline at end of file +82e309984cab644fd94f433d5ec24133 \ 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 d5874d88b..c9125e234 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 @@ -3f21254164f96de8ee4a28249ae72cc6 \ No newline at end of file +f1f85bcdba23e3e4001512c1c6c4707a \ No newline at end of file diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index 56bc4a00f..9d9a5fc74 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -333,7 +333,7 @@ class TestResult: @pytest.mark.parametrize('output',['F','*',['P']],ids=range(3)) @pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5'],ids=range(1)) @pytest.mark.parametrize('inc',[4,0],ids=range(2)) - def test_vtk(self,request,tmp_path,ref_path,update,output,fname,inc): + def test_vtk(self,request,tmp_path,ref_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc): result = Result(ref_path/fname).view('increments',inc) os.chdir(tmp_path) result.save_VTK(output) diff --git a/src/results.f90 b/src/results.f90 index 90727b9c3..f0af4a1cb 100644 --- a/src/results.f90 +++ b/src/results.f90 @@ -57,7 +57,7 @@ subroutine results_init(restart) logical, intent(in) :: restart - character(len=pStringLen) :: commandLine + character(len=pPathLen) :: commandLine print'(/,a)', ' <<<+- results init -+>>>'; flush(IO_STDOUT) @@ -67,8 +67,10 @@ subroutine results_init(restart) if(.not. restart) then resultsFile = HDF5_openFile(getSolverJobName()//'.hdf5','w') call results_addAttribute('DADF5_version_major',0) - call results_addAttribute('DADF5_version_minor',12) - call results_addAttribute('DAMASK_version',DAMASKVERSION) + call results_addAttribute('DADF5_version_minor',13) + call get_command_argument(0,commandLine) + call results_addAttribute('creator',trim(commandLine)//' '//DAMASKVERSION) + call results_addAttribute('created',now()) call get_command(commandLine) call results_addAttribute('call',trim(commandLine)) call results_closeGroup(results_addGroup('cell_to'))