From 0dd14a06528e5819e8af51fb9b3bec19954e507f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 30 Sep 2019 09:07:56 -0700 Subject: [PATCH] correct reporting of version --- python/damask/dadf5.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/python/damask/dadf5.py b/python/damask/dadf5.py index 1c0b0ddda..8444fa259 100644 --- a/python/damask/dadf5.py +++ b/python/damask/dadf5.py @@ -6,7 +6,7 @@ import h5py import numpy as np from . import util -from . import damask +from . import version # ------------------------------------------------------------------ class DADF5(): @@ -351,7 +351,7 @@ class DADF5(): 'Unit' : P['meta']['Unit'], 'Description' : 'Cauchy stress calculated from {} ({}) '.format(P['label'],P['meta']['Description'])+\ 'and deformation gradient {} ({})'.format(F['label'],F['meta']['Description']), - 'Creator' : 'dadf5.py:add_Cauchy vXXXXX' + 'Creator' : 'dadf5.py:add_Cauchy v{}'.format(version) } } @@ -385,7 +385,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : 'Mises equivalent {} of {} ({})'.format(t,x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_Mises_stress vXXXXX' + 'Creator' : 'dadf5.py:add_Mises_stress v{}'.format(version) } } @@ -420,7 +420,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : '{}-Norm of {} {} ({})'.format(ord,t,x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_norm vXXXXX' + 'Creator' : 'dadf5.py:add_norm v{}'.format(version) } } @@ -439,7 +439,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : 'Absolute value of {} ({})'.format(x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_abs vXXXXX' + 'Creator' : 'dadf5.py:add_abs v{}'.format(version) } } @@ -458,7 +458,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : 'Determinant of tensor {} ({})'.format(x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_determinant vXXXXX' + 'Creator' : 'dadf5.py:add_determinant v{}'.format(version) } } @@ -480,7 +480,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : 'Spherical component of tensor {} ({})'.format(x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_spherical vXXXXX' + 'Creator' : 'dadf5.py:add_spherical v{}'.format(version) } } @@ -503,7 +503,7 @@ class DADF5(): 'meta' : { 'Unit' : x['meta']['Unit'], 'Description' : 'Deviator of tensor {} ({})'.format(x['label'],x['meta']['Description']), - 'Creator' : 'dadf5.py:add_deviator vXXXXX' + 'Creator' : 'dadf5.py:add_deviator v{}'.format(version) } } @@ -534,7 +534,7 @@ class DADF5(): 'meta' : { 'Unit' : kwargs['unit'], 'Description' : '{}'.format(kwargs['description']), - 'Creator' : 'dadf5.py:add_calculation vXXXXX' + 'Creator' : 'dadf5.py:add_calculation v{}'.format(version) } } @@ -579,7 +579,7 @@ class DADF5(): 'meta' : { 'Unit' : defgrad['meta']['Unit'], 'Description' : 'Strain tensor ln(V){} ({})'.format(defgrad['label'],defgrad['meta']['Description']), - 'Creator' : 'dadf5.py:add_deviator vXXXXX' + 'Creator' : 'dadf5.py:add_deviator v{}'.format(version) } }