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

Merge branch 'development' into texture-components-in-rotation-class2

This commit is contained in:
Martin Diehl 2020-09-16 09:57:50 +02:00
parent c71768a37a 9cdf506612
commit 70911b64ea
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v3.0.0-alpha-160-g117f85ec v3.0.0-alpha-164-g7cda092a

9
python/tests/test_Rotation.py
View File

@ -687,6 +687,15 @@ class TestRotation:
print(u,c) print(u,c)
assert np.allclose(single(u),c) and np.allclose(single(u),vectorized(u)) assert np.allclose(single(u),c) and np.allclose(single(u),vectorized(u))
@pytest.mark.parametrize('func',[Rotation.from_axis_angle])
def test_normalization_vectorization(self,func):
"""Check vectorized implementation normalization."""
vec = np.random.rand(5,4)
ori = func(vec,normalize=True)
for v,o in zip(vec,ori):
assert np.allclose(func(v,normalize=True).as_quaternion(),o.as_quaternion())
@pytest.mark.parametrize('degrees',[True,False]) @pytest.mark.parametrize('degrees',[True,False])
def test_Eulers(self,set_of_rotations,degrees): def test_Eulers(self,set_of_rotations,degrees):
for rot in set_of_rotations: for rot in set_of_rotations:

2
src/grid/discretization_grid.f90
View File

@ -433,7 +433,7 @@ subroutine readVTR(grid,geomSize,origin,microstructure)
coords = as_pReal(base64_str,headerType,compressed,dataType) coords = as_pReal(base64_str,headerType,compressed,dataType)
delta = coords(2:) - coords(:size(coords)-1) delta = coords(2:) - coords(:size(coords)-1)
if(any(delta<0.0_pReal) .or. dNeq(maxval(delta),minval(delta))) & if(any(delta<0.0_pReal) .or. dNeq(maxval(delta),minval(delta),1.0e-8_pReal*maxval(abs(coords)))) &
call IO_error(error_ID = 844, ext_msg = 'grid spacing') call IO_error(error_ID = 844, ext_msg = 'grid spacing')
grid(direction) = size(coords)-1 grid(direction) = size(coords)-1