Merge branch '254-testing-resources-folder-name' into 'development'

more reasonable name Closes #254 See merge request damask/DAMASK!758
2023-05-01 12:35:56 +00:00 · 2023-05-01 12:35:56 +00:00 · 4eb5577652
parent da9b3c5bcd e62d1ac693
commit 4eb5577652
179 changed files with 159 additions and 158 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -12,12 +12,12 @@
 *.pbz2 binary
 # ignore files from MSC.Marc in language statistics
-install/MarcMentat/**     linguist-vendored
+install/MarcMentat/** linguist-vendored
-src/Marc/include/*             linguist-vendored
+src/Marc/include/* linguist-vendored
 install/MarcMentat/MSC_modifications.py linguist-vendored=false
 # ignore reference files for tests in language statistics
-python/tests/reference/**           linguist-vendored
+python/tests/resources/** linguist-vendored
 # ignore deprecated scripts
-processing/legacy/**                linguist-vendored
+processing/legacy/** linguist-vendored
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9c2a26c6068576370a7eb86a2a46606824ce4826
+Subproject commit 22a23a9d5939d49d9d277c7066d9b68003a33324
--- a/python/tests/conftest.py
+++ b/python/tests/conftest.py
@ -60,9 +60,9 @@ def update(request):
@pytest.fixture
-def ref_path_base():
+def res_path_base():
-    """Directory containing reference results."""
+    """Directory containing testing resources."""
-    return Path(__file__).parent/'reference'
+    return Path(__file__).parent/'resources'
@pytest.fixture
--- a/python/tests/resources/Colormap/binary.json
+++ b/python/tests/resources/Colormap/binary.json
--- a/python/tests/resources/Colormap/binary.legend
+++ b/python/tests/resources/Colormap/binary.legend
--- a/python/tests/resources/Colormap/binary.msh
+++ b/python/tests/resources/Colormap/binary.msh
--- a/python/tests/resources/Colormap/binary.txt
+++ b/python/tests/resources/Colormap/binary.txt
--- a/python/tests/resources/Colormap/shade_None.png
+++ b/python/tests/resources/Colormap/shade_None.png
--- a/python/tests/resources/Colormap/shade_[2,
+++ b/python/tests/resources/Colormap/shade_[2,
--- a/python/tests/resources/ConfigMaterial/2phase_irregularGrid.dream3d
+++ b/python/tests/resources/ConfigMaterial/2phase_irregularGrid.dream3d
--- a/python/tests/resources/ConfigMaterial/2phase_irregularGrid.json
+++ b/python/tests/resources/ConfigMaterial/2phase_irregularGrid.json
--- a/python/tests/resources/ConfigMaterial/2phase_irregularGrid.xdmf
+++ b/python/tests/resources/ConfigMaterial/2phase_irregularGrid.xdmf
--- a/python/tests/resources/ConfigMaterial/material.yaml
+++ b/python/tests/resources/ConfigMaterial/material.yaml
--- a/python/tests/resources/ConfigMaterial/measured.dream3d
+++ b/python/tests/resources/ConfigMaterial/measured.dream3d
--- a/python/tests/resources/ConfigMaterial/measured.material.yaml
+++ b/python/tests/resources/ConfigMaterial/measured.material.yaml
--- a/python/tests/resources/ConfigMaterial/measured.xdmf
+++ b/python/tests/resources/ConfigMaterial/measured.xdmf
--- a/python/tests/resources/Grid/.gitattributes
+++ b/python/tests/resources/Grid/.gitattributes
@ -0,0 +1 @@
 n10-id1_scaled.vtk binary 
--- a/python/tests/resources/Grid/2phase_irregularGrid.dream3d
+++ b/python/tests/resources/Grid/2phase_irregularGrid.dream3d
--- a/python/tests/resources/Grid/2phase_irregularGrid.json
+++ b/python/tests/resources/Grid/2phase_irregularGrid.json
--- a/python/tests/resources/Grid/2phase_irregularGrid.xdmf
+++ b/python/tests/resources/Grid/2phase_irregularGrid.xdmf
--- a/python/tests/resources/Grid/clean_1.0_1+2+3_False.vti
+++ b/python/tests/resources/Grid/clean_1.0_1+2+3_False.vti
--- a/python/tests/resources/Grid/clean_1.0_1+2+3_True.vti
+++ b/python/tests/resources/Grid/clean_1.0_1+2+3_True.vti
--- a/python/tests/resources/Grid/clean_1.0_1_False.vti
+++ b/python/tests/resources/Grid/clean_1.0_1_False.vti
--- a/python/tests/resources/Grid/clean_1.0_1_True.vti
+++ b/python/tests/resources/Grid/clean_1.0_1_True.vti
--- a/python/tests/resources/Grid/clean_1.0_None_False.vti
+++ b/python/tests/resources/Grid/clean_1.0_None_False.vti
--- a/python/tests/resources/Grid/clean_1.0_None_True.vti
+++ b/python/tests/resources/Grid/clean_1.0_None_True.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_1+2+3_False.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_1+2+3_False.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_1+2+3_True.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_1+2+3_True.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_1_False.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_1_False.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_1_True.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_1_True.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_None_False.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_None_False.vti
--- a/python/tests/resources/Grid/clean_1.7320508075688772_None_True.vti
+++ b/python/tests/resources/Grid/clean_1.7320508075688772_None_True.vti
--- a/python/tests/resources/Grid/flip_directions_x-y-z.vti
+++ b/python/tests/resources/Grid/flip_directions_x-y-z.vti
--- a/python/tests/resources/Grid/flip_directions_x.vti
+++ b/python/tests/resources/Grid/flip_directions_x.vti
--- a/python/tests/resources/Grid/flip_directions_y-z.vti
+++ b/python/tests/resources/Grid/flip_directions_y-z.vti
--- a/python/tests/resources/Grid/flip_directions_z-x-y.vti
+++ b/python/tests/resources/Grid/flip_directions_z-x-y.vti
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20.vti
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20.vti
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_x_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_x_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_x_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_x_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xy_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xy_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xy_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xy_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xyz_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xyz_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xyz_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xyz_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xz_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xz_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xz_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_xz_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_y_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_y_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_y_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_y_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_z_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_z_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_z_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_z_True.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_zy_False.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_zy_False.vtu
--- a/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_zy_True.vtu
+++ b/python/tests/resources/Grid/get_grain_boundaries_8g12x15x20_zy_True.vtu
--- a/python/tests/resources/Grid/measured.dream3d
+++ b/python/tests/resources/Grid/measured.dream3d
--- a/python/tests/resources/Grid/measured.vti
+++ b/python/tests/resources/Grid/measured.vti
--- a/python/tests/resources/Grid/measured.xdmf
+++ b/python/tests/resources/Grid/measured.xdmf
--- a/python/tests/resources/Grid/mirror_directions_x+reflect_False.vti
+++ b/python/tests/resources/Grid/mirror_directions_x+reflect_False.vti
--- a/python/tests/resources/Grid/mirror_directions_x-y-z+reflect_True.vti
+++ b/python/tests/resources/Grid/mirror_directions_x-y-z+reflect_True.vti
--- a/python/tests/resources/Grid/mirror_directions_y-z+reflect_False.vti
+++ b/python/tests/resources/Grid/mirror_directions_y-z+reflect_False.vti
--- a/python/tests/resources/Grid/mirror_directions_z-x-y+reflect_False.vti
+++ b/python/tests/resources/Grid/mirror_directions_z-x-y+reflect_False.vti
--- a/python/tests/resources/Grid/n10-id1_scaled.vti
+++ b/python/tests/resources/Grid/n10-id1_scaled.vti
--- a/python/tests/resources/Grid/n10-id1_scaled.vtk
+++ b/python/tests/resources/Grid/n10-id1_scaled.vtk
--- a/python/tests/resources/Grid/rotate_Eulers_0.0-32.0-240.0.vti
+++ b/python/tests/resources/Grid/rotate_Eulers_0.0-32.0-240.0.vti
--- a/python/tests/resources/Grid/rotate_Eulers_32.0-68.0-21.0.vti
+++ b/python/tests/resources/Grid/rotate_Eulers_32.0-68.0-21.0.vti
--- a/python/tests/resources/Grid/scale_grid_10-10-10.vti
+++ b/python/tests/resources/Grid/scale_grid_10-10-10.vti
--- a/python/tests/resources/Grid/scale_grid_10-11-10.vti
+++ b/python/tests/resources/Grid/scale_grid_10-11-10.vti
--- a/python/tests/resources/Grid/scale_grid_10-13-10.vti
+++ b/python/tests/resources/Grid/scale_grid_10-13-10.vti
--- a/python/tests/resources/Grid/scale_grid_10-20-2.vti
+++ b/python/tests/resources/Grid/scale_grid_10-20-2.vti
--- a/python/tests/resources/Grid/scale_grid_5-4-20.vti
+++ b/python/tests/resources/Grid/scale_grid_5-4-20.vti
--- a/python/tests/resources/Grid/scale_grid_8-10-12.vti
+++ b/python/tests/resources/Grid/scale_grid_8-10-12.vti
--- a/python/tests/resources/Orientation/cF_Bain.txt
+++ b/python/tests/resources/Orientation/cF_Bain.txt
--- a/python/tests/resources/Orientation/cF_GT.txt
+++ b/python/tests/resources/Orientation/cF_GT.txt
--- a/python/tests/resources/Orientation/cF_GT_prime.txt
+++ b/python/tests/resources/Orientation/cF_GT_prime.txt
--- a/python/tests/resources/Orientation/cF_KS.txt
+++ b/python/tests/resources/Orientation/cF_KS.txt
--- a/python/tests/resources/Orientation/cF_NW.txt
+++ b/python/tests/resources/Orientation/cF_NW.txt
--- a/python/tests/resources/Orientation/cF_Pitsch.txt
+++ b/python/tests/resources/Orientation/cF_Pitsch.txt
--- a/python/tests/resources/Orientation/cF_slip.txt
+++ b/python/tests/resources/Orientation/cF_slip.txt
--- a/python/tests/resources/Orientation/cF_twin.txt
+++ b/python/tests/resources/Orientation/cF_twin.txt
--- a/python/tests/resources/Orientation/cI_Bain.txt
+++ b/python/tests/resources/Orientation/cI_Bain.txt
--- a/python/tests/resources/Orientation/cI_GT.txt
+++ b/python/tests/resources/Orientation/cI_GT.txt
--- a/python/tests/resources/Orientation/cI_GT_prime.txt
+++ b/python/tests/resources/Orientation/cI_GT_prime.txt
--- a/python/tests/resources/Orientation/cI_KS.txt
+++ b/python/tests/resources/Orientation/cI_KS.txt
--- a/python/tests/resources/Orientation/cI_NW.txt
+++ b/python/tests/resources/Orientation/cI_NW.txt
--- a/python/tests/resources/Orientation/cI_Pitsch.txt
+++ b/python/tests/resources/Orientation/cI_Pitsch.txt
--- a/python/tests/resources/Orientation/cI_slip.txt
+++ b/python/tests/resources/Orientation/cI_slip.txt
--- a/python/tests/resources/Orientation/cI_twin.txt
+++ b/python/tests/resources/Orientation/cI_twin.txt
--- a/python/tests/resources/Orientation/hP_slip.txt
+++ b/python/tests/resources/Orientation/hP_slip.txt
--- a/python/tests/resources/Orientation/hP_twin.txt
+++ b/python/tests/resources/Orientation/hP_twin.txt
--- a/python/tests/resources/Orientation/unitcell_cubic_0_0_0.pdf
+++ b/python/tests/resources/Orientation/unitcell_cubic_0_0_0.pdf
--- a/python/tests/resources/Orientation/unitcell_cubic_0_45_0.pdf
+++ b/python/tests/resources/Orientation/unitcell_cubic_0_45_0.pdf
--- a/python/tests/resources/Orientation/unitcell_cubic_180_45_180.pdf
+++ b/python/tests/resources/Orientation/unitcell_cubic_180_45_180.pdf
--- a/python/tests/resources/Orientation/unitcell_cubic_45_0_0.pdf
+++ b/python/tests/resources/Orientation/unitcell_cubic_45_0_0.pdf
--- a/python/tests/resources/Orientation/unitcell_cubic_90_45_270.pdf
+++ b/python/tests/resources/Orientation/unitcell_cubic_90_45_270.pdf
--- a/python/tests/resources/Result/12grains6x7x8.material.yaml
+++ b/python/tests/resources/Result/12grains6x7x8.material.yaml
--- a/python/tests/resources/Result/12grains6x7x8.vti
+++ b/python/tests/resources/Result/12grains6x7x8.vti
--- a/python/tests/resources/Result/12grains6x7x8_tensionY.hdf5
+++ b/python/tests/resources/Result/12grains6x7x8_tensionY.hdf5
--- a/python/tests/resources/Result/4grains2x4x3.material.yaml
+++ b/python/tests/resources/Result/4grains2x4x3.material.yaml
--- a/python/tests/resources/Result/4grains2x4x3.vti
+++ b/python/tests/resources/Result/4grains2x4x3.vti
--- a/python/tests/resources/Result/4grains2x4x3_compressionY.hdf5
+++ b/python/tests/resources/Result/4grains2x4x3_compressionY.hdf5
--- a/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml
+++ b/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml
--- a/python/tests/resources/Result/6grains6x7x8_single_phase.vti
+++ b/python/tests/resources/Result/6grains6x7x8_single_phase.vti
--- a/python/tests/resources/Result/6grains6x7x8_single_phase_tensionY.hdf5
+++ b/python/tests/resources/Result/6grains6x7x8_single_phase_tensionY.hdf5
--- a/Show More
+++ b/Show More
		`@ -1 +1 @@`
			`Subproject commit 9c2a26c6068576370a7eb86a2a46606824ce4826`				`Subproject commit 22a23a9d5939d49d9d277c7066d9b68003a33324`