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

Merge remote-tracking branch 'origin/fiber_components_noalphabeta' into development

This commit is contained in:
Martin Diehl 2022-04-27 17:25:13 +02:00
parent 831cd42842 8f0240c67b
commit 8faa5296a1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/damask/_rotation.py
View File

@ -1096,8 +1096,8 @@ class Rotation:
@staticmethod
def from_fiber_component(alpha: IntSequence,
beta: IntSequence,
def from_fiber_component(crystal: IntSequence,
sample: IntSequence,
sigma: float = 0.0,
shape: Union[int, IntSequence] = None,
degrees: bool = True,
@ -1107,9 +1107,9 @@ class Rotation:
Parameters
----------
alpha : numpy.ndarray, shape (2)
crystal : numpy.ndarray, shape (2)
Polar coordinates (phi from x, theta from z) of fiber direction in crystal frame.
beta : numpy.ndarray, shape (2)
sample : numpy.ndarray, shape (2)
Polar coordinates (phi from x, theta from z) of fiber direction in sample frame.
sigma : float, optional
Standard deviation of (Gaussian) misorientation distribution.
@ -1117,15 +1117,15 @@ class Rotation:
shape : int or sequence of ints, optional
Shape of the returned array. Defaults to None, which gives a scalar.
degrees : bool, optional
sigma, alpha, and beta are given in degrees.
sigma and polar coordinates are given in degrees.
rng_seed : {None, int, array_like[ints], SeedSequence, BitGenerator, Generator}, optional
A seed to initialize the BitGenerator.
Defaults to None, i.e. unpredictable entropy will be pulled from the OS.
"""
rng = np.random.default_rng(rng_seed)
sigma_,alpha_,beta_ = (np.radians(coordinate) for coordinate in (sigma,alpha,beta)) if degrees else \
map(np.array, (sigma,alpha,beta))
sigma_,alpha_,beta_ = (np.radians(coordinate) for coordinate in (sigma,crystal,sample)) if degrees else \
map(np.array, (sigma,crystal,sample))
d_cr = np.array([np.sin(alpha_[0])*np.cos(alpha_[1]), np.sin(alpha_[0])*np.sin(alpha_[1]), np.cos(alpha_[0])])
d_lab = np.array([np.sin( beta_[0])*np.cos( beta_[1]), np.sin( beta_[0])*np.sin( beta_[1]), np.cos( beta_[0])])

4
python/tests/test_Orientation.py
View File

@ -150,9 +150,9 @@ class TestOrientation:
== np.eye(3))
def test_from_fiber_component(self):
r = Rotation.from_fiber_component(alpha=np.zeros(2),beta=np.zeros(2),
r = Rotation.from_fiber_component(crystal=np.zeros(2),sample=np.zeros(2),
sigma=0.0,shape=1,rng_seed=0)
assert np.all(Orientation.from_fiber_component(alpha=np.zeros(2),beta=np.zeros(2),
assert np.all(Orientation.from_fiber_component(crystal=np.zeros(2),sample=np.zeros(2),
sigma=0.0,shape=None,rng_seed=0,family='triclinic').quaternion
== r.quaternion)