From 0b29d081092256933d822512e561ba072e5a038b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 3 Oct 2019 19:02:17 +0200 Subject: [PATCH] bump to DADF5 v0.3 contains displacements (for grid solver) --- python/damask/dadf5.py | 8 ++++---- src/results.f90 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/damask/dadf5.py b/python/damask/dadf5.py index 43871742d..8303f167f 100644 --- a/python/damask/dadf5.py +++ b/python/damask/dadf5.py @@ -29,7 +29,7 @@ class DADF5(): """ with h5py.File(filename,'r') as f: - if f.attrs['DADF5-major'] != 0 or f.attrs['DADF5-minor'] != 2: + if f.attrs['DADF5-major'] != 0 or f.attrs['DADF5-minor'] <= 2: raise TypeError('Unsupported DADF5 version {} '.format(f.attrs['DADF5-version'])) self.structured = 'grid' in f['geometry'].attrs.keys() @@ -49,17 +49,17 @@ class DADF5(): self.con_physics = [] for c in self.constituents: self.con_physics += f['/'.join([self.increments[0],'constituent',c])].keys() - self.con_physics = list(set(self.con_physics)) # make unique + self.con_physics = list(set(self.con_physics)) # make unique self.mat_physics = [] for m in self.materialpoints: 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, 'constituents': self.constituents, 'materialpoints': self.materialpoints, - 'constituent': range(self.Nconstituents), # ToDo: stupid naming + 'constituent': range(self.Nconstituents), # ToDo: stupid naming 'con_physics': self.con_physics, 'mat_physics': self.mat_physics} diff --git a/src/results.f90 b/src/results.f90 index 9958afaf1..d13a36fde 100644 --- a/src/results.f90 +++ b/src/results.f90 @@ -68,9 +68,9 @@ subroutine results_init write(6,'(a)') ' https://doi.org/10.1007/s40192-018-0118-7' resultsFile = HDF5_openFile(trim(getSolverJobName())//'.hdf5','w',.true.) - call HDF5_addAttribute(resultsFile,'DADF5-version',0.2_pReal) + call HDF5_addAttribute(resultsFile,'DADF5-version',0.3_pReal) call HDF5_addAttribute(resultsFile,'DADF5-major',0) - call HDF5_addAttribute(resultsFile,'DADF5-minor',2) + call HDF5_addAttribute(resultsFile,'DADF5-minor',3) call HDF5_addAttribute(resultsFile,'DAMASK',DAMASKVERSION) call get_command(commandLine) call HDF5_addAttribute(resultsFile,'call',trim(commandLine))