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

fixed typos and other python warnings

This commit is contained in:
Vitesh Shah 2023-05-04 11:07:26 +02:00
parent 8de19f0c3b
commit b5b6c2d695
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/damask/_result.py
View File

@ -1960,13 +1960,12 @@ class Result:
----------
target_dir : str or pathlib.Path, optional
Directory to save DREAM3D files. Will be created if non-existent.
"""
Crystal_structures = {'fcc': 1,
'bcc': 1,
'hcp': 0,
'bct': 7,
'ort': 6} #TODO: is bct Tetragonal low/Tetragonal high?
Phase_types = {'Primary': 0} #further additions to these can be done by looking at 'Create Ensemble Info' filter, other options could be 'Precipitate' and so on.
Phase_types = {'Primary': 0}
#further additions to these can be done by looking at 'Create Ensemble Info' filter
# other options could be 'Precipitate' and so on.
# also crystal structures be added in a similar way
dx = self.size/self.cells
@ -1986,7 +1985,7 @@ class Result:
cell_orientation_array[at_cell_ph[c][label],:] = \
Rotation(data[in_data_ph[c][label],:]).as_Euler_angles()
# Dream3D handles euler angles better
except ValueError: #check if the exception is correct
except ValueError:
print("Orientation data is not present")
exit() # need to check if such a statement would really work.
@ -2036,8 +2035,10 @@ class Result:
# Data CrystalStructures
o[ensemble_label + '/CrystalStructures'] = np.uint32(np.array([999] + [1]*len(self.phases)))
# assuming only cubic crystal structures
# Damask can give the crystal structure info but need to look into dream3d which crystal structure corresponds to which number
o[ensemble_label + '/PhaseTypes'] = np.uint32(np.array([999] + [Phase_types['Primary']]*len(self.phases))).reshape((len(self.phases)+1,1))
# Damask can give the crystal structure info
# but need to look into dream3d which crystal structure corresponds to which number
o[ensemble_label + '/PhaseTypes'] = np.uint32(np.array([999] + [Phase_types['Primary']]*len(self.phases)))\
.reshape((len(self.phases)+1,1))
# also assuming Primary phases
# there can be precipitates etc as well
# Attributes Ensemble Matrix
@ -2065,13 +2066,6 @@ class Result:
o[geom_label].attrs['SpatialDimensionality'] = np.array([3],np.uint32)
o[geom_label].attrs['UnitDimensionality'] = np.array([3],np.uint32)
def export_DADF5(self,
fname,
output: Union[str, List[str]] = '*'):

4
python/tests/test_Result.py
View File

@ -499,13 +499,13 @@ class TestResult:
for dataset in ['DIMENSIONS','ORIGIN','SPACING']:
results_val = np.array(results_file[geom_label + '/' + dataset])
ref_val = np.array(ref_file[geom_label + '/' + dataset])
if not np.array_equal(ref_val,actual_val):
if not np.array_equal(ref_val,results_val):
error_messages.append(f'The {dataset} values are incorrect')
for attrs in ['GeometryName','GeometryTypeName','GeometryType','SpatialDimensionality','UnitDimensionality']:
ref_value = ref_file[geom_label].attrs[attrs]
actual_val = results_file[geom_label].attrs[attrs]
if not np.array_equal(ref_val,actual_val):
if not np.array_equal(ref_value,actual_val):
error_messages.append("Geometry attributes do not match")
assert not error_messages