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

more flexible and independent

This commit is contained in:
Martin Diehl 2020-06-30 18:12:19 +02:00
parent 6e27a140f6
commit bdb461a553
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
python/tests/conftest.py
View File

@ -3,8 +3,6 @@ import numpy as np
import pytest import pytest
from damask import Rotation
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addoption("--update", parser.addoption("--update",
action="store_true", action="store_true",
@ -21,8 +19,21 @@ def reference_dir_base():
return os.path.join(os.path.dirname(__file__),'reference') return os.path.join(os.path.dirname(__file__),'reference')
@pytest.fixture @pytest.fixture
def set_of_rotations(): def set_of_quaternions():
"""A set of n random rotations.""" """A set of n random rotations."""
def random_quaternions(N):
r = np.random.rand(N,3)
A = np.sqrt(r[:,2])
B = np.sqrt(1.0-r[:,2])
qu = np.column_stack([np.cos(2.0*np.pi*r[:,0])*A,
np.sin(2.0*np.pi*r[:,1])*B,
np.cos(2.0*np.pi*r[:,1])*B,
np.sin(2.0*np.pi*r[:,0])*A])
qu[:,0]*=np.sign(qu[:,0])
return qu
n = 1100 n = 1100
scatter=1.e-2 scatter=1.e-2
specials = np.array([ specials = np.array([
@ -92,6 +103,6 @@ def set_of_rotations():
specials_scatter /= np.linalg.norm(specials_scatter,axis=1).reshape(-1,1) specials_scatter /= np.linalg.norm(specials_scatter,axis=1).reshape(-1,1)
specials_scatter[specials_scatter[:,0]<0]*=-1 specials_scatter[specials_scatter[:,0]<0]*=-1
return [Rotation.from_quaternion(s) for s in specials] + \ return [s for s in specials] + \
[Rotation.from_quaternion(s) for s in specials_scatter] + \ [s for s in specials_scatter] + \
[Rotation.from_random() for _ in range(n-len(specials)-len(specials_scatter))] [s for s in random_quaternions(n-2*len(specials))]

8
python/tests/test_Rotation.py
View File

@ -14,6 +14,10 @@ def reference_dir(reference_dir_base):
"""Directory containing reference results.""" """Directory containing reference results."""
return os.path.join(reference_dir_base,'Rotation') return os.path.join(reference_dir_base,'Rotation')
@pytest.fixture
def set_of_rotations(set_of_quaternions):
return [Rotation.from_quaternion(s) for s in set_of_quaternions]
#################################################################################################### ####################################################################################################
# Code below available according to the following conditions on https://github.com/MarDiehl/3Drotations # Code below available according to the following conditions on https://github.com/MarDiehl/3Drotations
@ -607,9 +611,9 @@ class TestRotation:
(Rotation._qu2ax,qu2ax), (Rotation._qu2ax,qu2ax),
(Rotation._qu2ro,qu2ro), (Rotation._qu2ro,qu2ro),
(Rotation._qu2ho,qu2ho)]) (Rotation._qu2ho,qu2ho)])
def test_quaternion_vectorization(self,set_of_rotations,vectorized,single): def test_quaternion_vectorization(self,set_of_quaternions,vectorized,single):
"""Check vectorized implementation for quaternion against single point calculation.""" """Check vectorized implementation for quaternion against single point calculation."""
qu = np.array([rot.as_quaternion() for rot in set_of_rotations]) qu = np.array(set_of_quaternions)
vectorized(qu.reshape(qu.shape[0]//2,-1,4)) vectorized(qu.reshape(qu.shape[0]//2,-1,4))
co = vectorized(qu) co = vectorized(qu)
for q,c in zip(qu,co): for q,c in zip(qu,co):