merge with current development branch

This commit is contained in:
Daniel Otto de Mentock 2022-01-05 14:06:06 +01:00
parent 7c7c3926b7
commit e60d41d5e4
1 changed files with 2 additions and 2 deletions

View File

@ -205,7 +205,7 @@ class Grid:
Grid-based geometry from file.
"""
warnings.warn('Support for ASCII-based geom format will be removed in DAMASK 3.1.0', DeprecationWarning,2)
warnings.warn('Support for ASCII-based geom format will be removed in DAMASK 3.0.0', DeprecationWarning,2)
if isinstance(fname, (str, Path)):
f = open(fname)
elif isinstance(fname, TextIO):
@ -652,7 +652,7 @@ class Grid:
Compress geometry with 'x of y' and 'a to b'.
"""
warnings.warn('Support for ASCII-based geom format will be removed in DAMASK 3.1.0', DeprecationWarning,2)
warnings.warn('Support for ASCII-based geom format will be removed in DAMASK 3.0.0', DeprecationWarning,2)
header = [f'{len(self.comments)+4} header'] + self.comments \
+ ['grid a {} b {} c {}'.format(*self.cells),
'size x {} y {} z {}'.format(*self.size),