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

polishing

This commit is contained in:
Martin Diehl 2020-05-23 15:54:28 +02:00
parent 82419f8649
commit a3d9520c4b
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/damask/_result.py
View File

@ -599,9 +599,6 @@ class Result:
@staticmethod @staticmethod
def _add_deviator(T): def _add_deviator(T):
if not T['data'].shape[1:] == (3,3):
raise ValueError
return { return {
'data': mechanics.deviatoric_part(T['data']), 'data': mechanics.deviatoric_part(T['data']),
'label': 's_{}'.format(T['label']), 'label': 's_{}'.format(T['label']),
@ -867,8 +864,6 @@ class Result:
@staticmethod @staticmethod
def _add_rotational_part(F): def _add_rotational_part(F):
if not F['data'].shape[1:] == (3,3):
raise ValueError
return { return {
'data': mechanics.rotational_part(F['data']), 'data': mechanics.rotational_part(F['data']),
'label': 'R({})'.format(F['label']), 'label': 'R({})'.format(F['label']),
@ -893,9 +888,6 @@ class Result:
@staticmethod @staticmethod
def _add_spherical(T): def _add_spherical(T):
if not T['data'].shape[1:] == (3,3):
raise ValueError
return { return {
'data': mechanics.spherical_part(T['data']), 'data': mechanics.spherical_part(T['data']),
'label': 'p_{}'.format(T['label']), 'label': 'p_{}'.format(T['label']),
@ -920,9 +912,6 @@ class Result:
@staticmethod @staticmethod
def _add_strain_tensor(F,t,m): def _add_strain_tensor(F,t,m):
if not F['data'].shape[1:] == (3,3):
raise ValueError
return { return {
'data': mechanics.strain_tensor(F['data'],t,m), 'data': mechanics.strain_tensor(F['data'],t,m),
'label': 'epsilon_{}^{}({})'.format(t,m,F['label']), 'label': 'epsilon_{}^{}({})'.format(t,m,F['label']),
@ -954,9 +943,6 @@ class Result:
@staticmethod @staticmethod
def _add_stretch_tensor(F,t): def _add_stretch_tensor(F,t):
if not F['data'].shape[1:] == (3,3):
raise ValueError
return { return {
'data': mechanics.left_stretch(F['data']) if t == 'V' else mechanics.right_stretch(F['data']), 'data': mechanics.left_stretch(F['data']) if t == 'V' else mechanics.right_stretch(F['data']),
'label': '{}({})'.format(t,F['label']), 'label': '{}({})'.format(t,F['label']),
@ -1047,7 +1033,7 @@ class Result:
Selection is not taken into account. Selection is not taken into account.
""" """
if len(self.constituents) != 1 or not self.structured: if len(self.constituents) != 1 or not self.structured:
raise NotImplementedError raise NotImplementedError('XDMF only available for grid results with 1 constituent.')
xdmf=ET.Element('Xdmf') xdmf=ET.Element('Xdmf')
xdmf.attrib={'Version': '2.0', xdmf.attrib={'Version': '2.0',
@ -1215,14 +1201,6 @@ class Result:
################################################################################################### ###################################################################################################
# BEGIN DEPRECATED # BEGIN DEPRECATED
def _time_to_inc(self,start,end):
selected = []
for i,time in enumerate(self.times):
if start <= time <= end:
selected.append(self.increments[i])
return selected
def set_by_time(self,start,end): def set_by_time(self,start,end):
""" """
Set active increments based on start and end time. Set active increments based on start and end time.
@ -1235,4 +1213,4 @@ class Result:
end time (included) end time (included)
""" """
self._manage_selection('set','increments',self._time_to_inc(start,end)) self._manage_selection('set','times',self.times_in_range(start,end))