diff --git a/python/tests/reference/Result/export_VTK/test_vtk[0-0-1].md5 b/python/tests/reference/Result/export_VTK/test_vtk[0-0-1].md5 index 695f6cca5..3269636ae 100644 --- a/python/tests/reference/Result/export_VTK/test_vtk[0-0-1].md5 +++ b/python/tests/reference/Result/export_VTK/test_vtk[0-0-1].md5 @@ -1 +1 @@ -eb506713032481aebf870b965eaca8b5 \ No newline at end of file +6fb37bd65934de859dd6b6e0191e7d64 \ No newline at end of file diff --git a/python/tests/reference/Result/export_VTK/test_vtk[0-0-3].md5 b/python/tests/reference/Result/export_VTK/test_vtk[0-0-3].md5 new file mode 100644 index 000000000..8555f7692 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_vtk[0-0-3].md5 @@ -0,0 +1 @@ +bb783bb80ff04dd435e814f4b82a3234 \ No newline at end of file diff --git a/python/tests/reference/Result/export_VTK/test_vtk[1-0-3].md5 b/python/tests/reference/Result/export_VTK/test_vtk[1-0-3].md5 new file mode 100644 index 000000000..61ad31564 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_vtk[1-0-3].md5 @@ -0,0 +1 @@ +ba97286c5d95bf817143f7bb9cf58421 \ No newline at end of file diff --git a/python/tests/test_Crystal.py b/python/tests/test_Crystal.py index 5481003c9..8b5217f63 100644 --- a/python/tests/test_Crystal.py +++ b/python/tests/test_Crystal.py @@ -1,10 +1,20 @@ import pytest import numpy as np +import damask from damask import Crystal class TestCrystal: + @pytest.mark.parametrize('lattice,family',[('aP','cubic'),('xI','cubic')]) + def test_invalid_init(self,lattice,family): + with pytest.raises(KeyError): + Crystal(family=family,lattice=lattice) + + def test_eq(self): + family = np.random.choice(list(damask._crystal.lattice_symmetries.values())) + assert Crystal(family=family) == Crystal(family=family) + def test_double_to_lattice(self): c = Crystal(lattice='cF') with pytest.raises(KeyError): @@ -55,3 +65,4 @@ class TestCrystal: alpha=alpha,beta=beta,gamma=gamma) assert np.allclose(vector, c.to_frame(**{keyFrame:c.to_lattice(**{keyLattice:vector})})) + diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index d6b630e52..d09a95815 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -369,8 +369,7 @@ class TestResult: b = default.coordinates0_node.reshape(tuple(default.cells+1)+(3,),order='F') assert np.allclose(a,b) - # need to wait for writing in parallel, output order might change if select more than one - @pytest.mark.parametrize('output',['F','*',['P']],ids=range(3)) + @pytest.mark.parametrize('output',['F','*',['P'],['P','F']],ids=range(4)) @pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5'],ids=range(1)) @pytest.mark.parametrize('inc',[4,0],ids=range(2)) def test_vtk(self,request,tmp_path,ref_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc):