diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 index 6cfc9b4b4..de5082a0d 100644 Binary files a/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 and b/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 differ diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY_restart.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY_restart.hdf5 new file mode 100644 index 000000000..d3c5a8004 Binary files /dev/null and b/python/tests/reference/Result/12grains6x7x8_tensionY_restart.hdf5 differ diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5 new file mode 100644 index 000000000..64430ba9a Binary files /dev/null and b/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5 differ diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-0].md5 new file mode 100644 index 000000000..80b468fbb --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-0].md5 @@ -0,0 +1 @@ +85ce65348539cc823f103a29e3e237f0 diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-1].md5 new file mode 100644 index 000000000..20beaee70 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-1].md5 @@ -0,0 +1 @@ +27972d6a0955e4e6e27a6ac5762abda8 diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-2].md5 new file mode 100644 index 000000000..baedd0b60 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-2].md5 @@ -0,0 +1 @@ +3971cf9ac0a9598d3171c049ebb213f3 diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-3].md5 new file mode 100644 index 000000000..65ee728f7 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-0-3].md5 @@ -0,0 +1 @@ +e7d52ecf304e56e6ef81702b5a5845f3 diff --git a/python/tests/reference/Result/export_VTK/test_vtk[1-0-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-0].md5 similarity index 100% rename from python/tests/reference/Result/export_VTK/test_vtk[1-0-0].md5 rename to python/tests/reference/Result/export_VTK/test_export_vtk[1-0-0].md5 diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-1].md5 new file mode 100644 index 000000000..9f551820c --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-1].md5 @@ -0,0 +1 @@ +dd71d25ccb52c3fdfd2ab727fc852a98 diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-2].md5 new file mode 100644 index 000000000..4d7ea4021 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-2].md5 @@ -0,0 +1 @@ +17dfe701be0c3a5e1a29d7a2b49c3afe diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-3].md5 new file mode 100644 index 000000000..73ca96212 --- /dev/null +++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-0-3].md5 @@ -0,0 +1 @@ +ff8883bb1d5c3de706e7c69bc67a366d diff --git a/python/tests/reference/Result/export_VTK/test_vtk[0-0-0].md5 b/python/tests/reference/Result/export_VTK/test_vtk[0-0-0].md5 deleted file mode 100644 index dc8144b94..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[0-0-0].md5 +++ /dev/null @@ -1 +0,0 @@ -a40baead936c79dd4f86f84ad858b9fa 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 deleted file mode 100644 index b5782429c..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[0-0-1].md5 +++ /dev/null @@ -1 +0,0 @@ -6fb37bd65934de859dd6b6e0191e7d64 diff --git a/python/tests/reference/Result/export_VTK/test_vtk[0-0-2].md5 b/python/tests/reference/Result/export_VTK/test_vtk[0-0-2].md5 deleted file mode 100644 index 92d3956b6..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[0-0-2].md5 +++ /dev/null @@ -1 +0,0 @@ -61953c35f61f3234b98d78a912e7dc83 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 deleted file mode 100644 index 42ccd0e25..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[0-0-3].md5 +++ /dev/null @@ -1 +0,0 @@ -bb783bb80ff04dd435e814f4b82a3234 diff --git a/python/tests/reference/Result/export_VTK/test_vtk[1-0-1].md5 b/python/tests/reference/Result/export_VTK/test_vtk[1-0-1].md5 deleted file mode 100644 index c53be5801..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[1-0-1].md5 +++ /dev/null @@ -1 +0,0 @@ -e1ca5306082fc3ab411f5ddab1a2e370 diff --git a/python/tests/reference/Result/export_VTK/test_vtk[1-0-2].md5 b/python/tests/reference/Result/export_VTK/test_vtk[1-0-2].md5 deleted file mode 100644 index 90f0ebc9c..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[1-0-2].md5 +++ /dev/null @@ -1 +0,0 @@ -1641c3b3641e942ffc325d471bdfaf00 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 deleted file mode 100644 index cfe43f9cb..000000000 --- a/python/tests/reference/Result/export_VTK/test_vtk[1-0-3].md5 +++ /dev/null @@ -1 +0,0 @@ -ba97286c5d95bf817143f7bb9cf58421 diff --git a/python/tests/reference/Result/get/test_get[0].pbz2 b/python/tests/reference/Result/get/test_get[0].pbz2 index e4ef0bde9..9a598fd44 100644 Binary files a/python/tests/reference/Result/get/test_get[0].pbz2 and b/python/tests/reference/Result/get/test_get[0].pbz2 differ diff --git a/python/tests/reference/Result/get/test_get[2].pbz2 b/python/tests/reference/Result/get/test_get[2].pbz2 index c8398ab2f..e85ab0a06 100644 Binary files a/python/tests/reference/Result/get/test_get[2].pbz2 and b/python/tests/reference/Result/get/test_get[2].pbz2 differ diff --git a/python/tests/reference/Result/get/test_get[3].pbz2 b/python/tests/reference/Result/get/test_get[3].pbz2 index d2eb08545..b28255817 100644 Binary files a/python/tests/reference/Result/get/test_get[3].pbz2 and b/python/tests/reference/Result/get/test_get[3].pbz2 differ diff --git a/python/tests/reference/Result/get/test_get[4].pbz2 b/python/tests/reference/Result/get/test_get[4].pbz2 index c10fa916b..d293c5c52 100644 Binary files a/python/tests/reference/Result/get/test_get[4].pbz2 and b/python/tests/reference/Result/get/test_get[4].pbz2 differ diff --git a/python/tests/reference/Result/get/test_get[6].pbz2 b/python/tests/reference/Result/get/test_get[6].pbz2 index 4459d2e59..9f1706371 100644 Binary files a/python/tests/reference/Result/get/test_get[6].pbz2 and b/python/tests/reference/Result/get/test_get[6].pbz2 differ diff --git a/python/tests/reference/Result/get/test_get[7].pbz2 b/python/tests/reference/Result/get/test_get[7].pbz2 index c1e4c31e9..67fb5ff13 100644 Binary files a/python/tests/reference/Result/get/test_get[7].pbz2 and b/python/tests/reference/Result/get/test_get[7].pbz2 differ diff --git a/python/tests/reference/Result/material.yaml b/python/tests/reference/Result/material.yaml new file mode 120000 index 000000000..6bcb65e61 --- /dev/null +++ b/python/tests/reference/Result/material.yaml @@ -0,0 +1 @@ +12grains6x7x8.material.yaml \ No newline at end of file diff --git a/python/tests/reference/Result/place/test_place[0].pbz2 b/python/tests/reference/Result/place/test_place[0].pbz2 index 2d1d432b9..fdfef5961 100644 Binary files a/python/tests/reference/Result/place/test_place[0].pbz2 and b/python/tests/reference/Result/place/test_place[0].pbz2 differ diff --git a/python/tests/reference/Result/place/test_place[2].pbz2 b/python/tests/reference/Result/place/test_place[2].pbz2 index cfc94f1ee..19caac392 100644 Binary files a/python/tests/reference/Result/place/test_place[2].pbz2 and b/python/tests/reference/Result/place/test_place[2].pbz2 differ diff --git a/python/tests/reference/Result/place/test_place[3].pbz2 b/python/tests/reference/Result/place/test_place[3].pbz2 index 96f782ae2..1ef2bfec3 100644 Binary files a/python/tests/reference/Result/place/test_place[3].pbz2 and b/python/tests/reference/Result/place/test_place[3].pbz2 differ diff --git a/python/tests/reference/Result/place/test_place[4].pbz2 b/python/tests/reference/Result/place/test_place[4].pbz2 index f2f744121..beae7e608 100644 Binary files a/python/tests/reference/Result/place/test_place[4].pbz2 and b/python/tests/reference/Result/place/test_place[4].pbz2 differ diff --git a/python/tests/reference/Result/place/test_place[6].pbz2 b/python/tests/reference/Result/place/test_place[6].pbz2 index 2844addcb..0246231f4 100644 Binary files a/python/tests/reference/Result/place/test_place[6].pbz2 and b/python/tests/reference/Result/place/test_place[6].pbz2 differ diff --git a/python/tests/reference/Result/place/test_place[7].pbz2 b/python/tests/reference/Result/place/test_place[7].pbz2 index cd4f098a1..808f4c514 100644 Binary files a/python/tests/reference/Result/place/test_place[7].pbz2 and b/python/tests/reference/Result/place/test_place[7].pbz2 differ diff --git a/python/tests/reference/Result/tensionY_restart.yaml b/python/tests/reference/Result/tensionY_restart.yaml new file mode 100644 index 000000000..89cfcc325 --- /dev/null +++ b/python/tests/reference/Result/tensionY_restart.yaml @@ -0,0 +1,18 @@ +--- +solver: + mechanical: spectral_basic + +loadstep: + - boundary_conditions: + mechanical: + dot_F: [[x, 0, 0], + [0, 1.0e-3, 0], + [0, 0, x]] + P: [[0, x, x], + [x, x, x], + [x, x, 0]] + discretization: + t: 10 + N: 20 + f_out: 4 + f_restart: 20 diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py index 20b86478c..cbc4553d2 100644 --- a/python/tests/test_Result.py +++ b/python/tests/test_Result.py @@ -378,7 +378,7 @@ class TestResult: @pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5'],ids=range(1)) @pytest.mark.parametrize('inc',[4,0],ids=range(2)) @pytest.mark.xfail(int(vtk.vtkVersion.GetVTKVersion().split('.')[0])<9, reason='missing "Direction" attribute') - def test_vtk(self,request,tmp_path,ref_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc): + def test_export_vtk(self,request,tmp_path,ref_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc): result = Result(ref_path/fname).view(increments=inc) result.export_VTK(output,target_dir=tmp_path,parallel=False) fname = fname.split('.')[0]+f'_inc{(inc if type(inc) == int else inc[0]):0>2}.vti' @@ -395,7 +395,7 @@ class TestResult: @pytest.mark.parametrize('mode',['point','cell']) @pytest.mark.parametrize('output',[False,True]) - def test_vtk_marc(self,tmp_path,ref_path,mode,output): + def test_export_vtk_marc(self,tmp_path,ref_path,mode,output): os.chdir(tmp_path) result = Result(ref_path/'check_compile_job1.hdf5') result.export_VTK(output,mode) @@ -552,6 +552,10 @@ class TestResult: assert f_hdf5[f'setup/{file}'][()][0].decode() == f.read() r.export_simulation_setup(output,target_dir=tmp_path,overwrite=overwrite) + def test_export_simulation_setup_restart(self,default,tmp_path): + default.export_simulation_setup(target_dir=tmp_path) + assert (tmp_path/'previous').is_dir() + def test_export_simulation_setup_custom_path(self,ref_path,tmp_path): src = ref_path/'4grains2x4x3_compressionY.hdf5' subdir = 'export_dir'