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

tuples not needed for single arguments

This commit is contained in:
Martin Diehl 2020-03-31 11:05:25 +02:00
parent 6ef7410e5a
commit 01818cba80
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/tests/test_Geom.py
View File

@ -72,7 +72,7 @@ class TestGeom:
if update: modified.to_file(reference) if update: modified.to_file(reference)
assert geom_equal(modified,Geom.from_file(reference)) assert geom_equal(modified,Geom.from_file(reference))
@pytest.mark.parametrize('stencil',[(1),(2),(3),(4)]) @pytest.mark.parametrize('stencil',[1,2,3,4])
def test_clean(self,default,update,reference_dir,stencil): def test_clean(self,default,update,reference_dir,stencil):
modified = copy.deepcopy(default) modified = copy.deepcopy(default)
modified.clean(stencil) modified.clean(stencil)
@ -82,12 +82,12 @@ class TestGeom:
assert geom_equal(modified,Geom.from_file(reference)) assert geom_equal(modified,Geom.from_file(reference))
@pytest.mark.parametrize('grid',[ @pytest.mark.parametrize('grid',[
((10,11,10)), (10,11,10),
([10,13,10]), [10,13,10],
(np.array((10,10,10))), np.array((10,10,10)),
(np.array((8, 10,12))), np.array((8, 10,12)),
(np.array((5, 4, 20))), np.array((5, 4, 20)),
(np.array((10,20,2)) ) np.array((10,20,2))
] ]
) )
def test_scale(self,default,update,reference_dir,grid): def test_scale(self,default,update,reference_dir,grid):
@ -98,7 +98,7 @@ class TestGeom:
if update: modified.to_file(reference) if update: modified.to_file(reference)
assert geom_equal(modified,Geom.from_file(reference)) assert geom_equal(modified,Geom.from_file(reference))
@pytest.mark.parametrize('periodic',[(True),(False)]) @pytest.mark.parametrize('periodic',[True,False])
def test_tessellation_approaches(self,periodic): def test_tessellation_approaches(self,periodic):
grid = np.random.randint(10,20,3) grid = np.random.randint(10,20,3)
size = np.random.random(3) + 1.0 size = np.random.random(3) + 1.0
@ -119,7 +119,7 @@ class TestGeom:
Laguerre = Geom.from_Laguerre_tessellation(grid,size,seeds,weights,np.random.random()>0.5) Laguerre = Geom.from_Laguerre_tessellation(grid,size,seeds,weights,np.random.random()>0.5)
assert np.all(Laguerre.microstructure == ms) assert np.all(Laguerre.microstructure == ms)
@pytest.mark.parametrize('approach',[('Laguerre'),('Voronoi')]) @pytest.mark.parametrize('approach',['Laguerre','Voronoi'])
def test_tessellate_bicrystal(self,approach): def test_tessellate_bicrystal(self,approach):
grid = np.random.randint(5,10,3)*2 grid = np.random.randint(5,10,3)*2
size = grid.astype(np.float) size = grid.astype(np.float)

1
python/tests/test_VTK.py
View File

@ -1,5 +1,4 @@
import os import os
import sys
import pytest import pytest
import numpy as np import numpy as np