Merge branch '254-testing-resources-folder-name' into 'development'
more reasonable name Closes #254 See merge request damask/DAMASK!758
This commit is contained in:
Philip Eisenlohr
commit
4eb5577652
.gitattributesPRIVATE
python/tests
conftest.py
resources
Colormap
ConfigMaterial
2phase_irregularGrid.dream3d2phase_irregularGrid.json2phase_irregularGrid.xdmfmaterial.yamlmeasured.dream3dmeasured.material.yamlmeasured.xdmf
Grid
.gitattributes2phase_irregularGrid.dream3d2phase_irregularGrid.json2phase_irregularGrid.xdmfclean_1.0_1+2+3_False.vticlean_1.0_1+2+3_True.vticlean_1.0_1_False.vticlean_1.0_1_True.vticlean_1.0_None_False.vticlean_1.0_None_True.vticlean_1.7320508075688772_1+2+3_False.vticlean_1.7320508075688772_1+2+3_True.vticlean_1.7320508075688772_1_False.vticlean_1.7320508075688772_1_True.vticlean_1.7320508075688772_None_False.vticlean_1.7320508075688772_None_True.vtiflip_directions_x-y-z.vtiflip_directions_x.vtiflip_directions_y-z.vtiflip_directions_z-x-y.vtiget_grain_boundaries_8g12x15x20.vtiget_grain_boundaries_8g12x15x20_x_False.vtuget_grain_boundaries_8g12x15x20_x_True.vtuget_grain_boundaries_8g12x15x20_xy_False.vtuget_grain_boundaries_8g12x15x20_xy_True.vtuget_grain_boundaries_8g12x15x20_xyz_False.vtuget_grain_boundaries_8g12x15x20_xyz_True.vtuget_grain_boundaries_8g12x15x20_xz_False.vtuget_grain_boundaries_8g12x15x20_xz_True.vtuget_grain_boundaries_8g12x15x20_y_False.vtuget_grain_boundaries_8g12x15x20_y_True.vtuget_grain_boundaries_8g12x15x20_z_False.vtuget_grain_boundaries_8g12x15x20_z_True.vtuget_grain_boundaries_8g12x15x20_zy_False.vtuget_grain_boundaries_8g12x15x20_zy_True.vtumeasured.dream3dmeasured.vtimeasured.xdmfmirror_directions_x+reflect_False.vtimirror_directions_x-y-z+reflect_True.vtimirror_directions_y-z+reflect_False.vtimirror_directions_z-x-y+reflect_False.vtin10-id1_scaled.vtin10-id1_scaled.vtkrotate_Eulers_0.0-32.0-240.0.vtirotate_Eulers_32.0-68.0-21.0.vtiscale_grid_10-10-10.vtiscale_grid_10-11-10.vtiscale_grid_10-13-10.vtiscale_grid_10-20-2.vtiscale_grid_5-4-20.vtiscale_grid_8-10-12.vti
Orientation
cF_Bain.txtcF_GT.txtcF_GT_prime.txtcF_KS.txtcF_NW.txtcF_Pitsch.txtcF_slip.txtcF_twin.txtcI_Bain.txtcI_GT.txtcI_GT_prime.txtcI_KS.txtcI_NW.txtcI_Pitsch.txtcI_slip.txtcI_twin.txthP_slip.txthP_twin.txtunitcell_cubic_0_0_0.pdfunitcell_cubic_0_45_0.pdfunitcell_cubic_180_45_180.pdfunitcell_cubic_45_0_0.pdfunitcell_cubic_90_45_270.pdf
Result
|
|
@ -12,12 +12,12 @@
|
|||
*.pbz2 binary
|
||||
|
||||
# ignore files from MSC.Marc in language statistics
|
||||
install/MarcMentat/** linguist-vendored
|
||||
src/Marc/include/* linguist-vendored
|
||||
install/MarcMentat/** 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
|
||||
|
|
|
|||
2
PRIVATE
2
PRIVATE
|
|
@ -1 +1 @@
|
|||
Subproject commit 9c2a26c6068576370a7eb86a2a46606824ce4826
|
||||
Subproject commit 22a23a9d5939d49d9d277c7066d9b68003a33324
|
||||
|
|
@ -60,9 +60,9 @@ def update(request):
|
|||
|
||||
|
||||
@pytest.fixture
|
||||
def ref_path_base():
|
||||
"""Directory containing reference results."""
|
||||
return Path(__file__).parent/'reference'
|
||||
def res_path_base():
|
||||
"""Directory containing testing resources."""
|
||||
return Path(__file__).parent/'resources'
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
|
|
|||
|
Before 
(image error) Size: 147 B After 
(image error) Size: 147 B
|
|
Before 
(image error) Size: 138 B After 
(image error) Size: 138 B
|
|
|
@ -0,0 +1 @@
|
|||
n10-id1_scaled.vtk binary
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue