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

equivalentOrientations accepts scalar argument to directly return single rotation object (not single element list)

This commit is contained in:
Philip Eisenlohr 2019-04-11 19:07:41 -04:00
parent 2190c3ef46
commit 3d6eb76da3
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/damask/orientation.py
View File

@ -510,7 +510,7 @@ class Symmetry:
otherOrder = Symmetry.lattices.index(other.lattice)
return (myOrder > otherOrder) - (myOrder < otherOrder)
def symmetryOperations(self,who=[]):
def symmetryOperations(self,members=[]):
"""List of symmetry operations as quaternions."""
if self.lattice == 'cubic':
symQuats = [
@ -577,8 +577,14 @@ class Symmetry:
[ 1.0,0.0,0.0,0.0 ],
]
return list(map(Rotation,
np.array(symQuats)[np.atleast_1d(np.array(who)) if who != [] else range(len(symQuats))]))
symOps = list(map(Rotation,
np.array(symQuats)[np.atleast_1d(members) if members != [] else range(len(symQuats))]))
try:
iter(members) # asking for (even empty) list of members?
except TypeError:
return symOps[0] # no, return rotation object
else:
return symOps # yes, return list of rotations
def inFZ(self,R):
@ -1096,10 +1102,15 @@ class Orientation:
def inFZ(self):
return self.lattice.symmetry.inFZ(self.rotation.asRodrigues())
def equivalentOrientations(self, who=[]):
def equivalentOrientations(self,members=[]):
"""List of orientations which are symmetrically equivalent"""
try:
iter(members) # asking for (even empty) list of members?
except TypeError:
return self.__class__(self.lattice.symmetry.symmetryOperations(members)*self.rotation,self.lattice) # no, return rotation object
else:
return [self.__class__(q*self.rotation,self.lattice) \
for q in self.lattice.symmetry.symmetryOperations(who)]
for q in self.lattice.symmetry.symmetryOperations(members)] # yes, return list of rotations
def relatedOrientations(self,model):
"""List of orientations related by the given orientation relationship"""