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

Merge branch 'docstring-polishing' into 'development' 

increasing consistency

See merge request damask/DAMASK!616
This commit is contained in:
Martin Diehl 2022-08-17 04:41:11 +00:00
parent 793fb3d9aa b7cd0c1d51
commit 31fe894c78
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/damask/_config.py
View File

@ -120,7 +120,7 @@ class Config(dict):
""" """
Return self|=other. Return self|=other.
Update configuration with contents of other. Update configuration with contents of other (in-place).
""" """
return self.__or__(other) return self.__or__(other)

6
python/damask/_orientation.py
View File

@ -246,11 +246,13 @@ class Orientation(Rotation,Crystal):
def __mul__(self: MyType, def __mul__(self: MyType,
other: Union[Rotation, 'Orientation']) -> MyType: other: Union[Rotation, 'Orientation']) -> MyType:
""" """
Compose this orientation with other. Return self*other.
Compose with other.
Parameters Parameters
---------- ----------
other : Rotation or Orientation other : Rotation or Orientation, shape (self.shape)
Object for composition. Object for composition.
Returns Returns