Skip to content

Commit 44fda8c

Browse files
committed
Merge branch '508-hdf5-issue-on-windows' into 'development'
re-created DADF5 file with current DAMASK version Closes #508 See merge request damask/DAMASK!1087
2 parents 6654379 + 40c6f1f commit 44fda8c

9 files changed

+537
-537
lines changed
File renamed without changes.
Binary file not shown.
Binary file not shown.

python/tests/resources/Result/6grains6x7x8_single_phase_tensionY.xdmf renamed to python/tests/resources/Result/6grains6x7x8_tensionY_singlePhase.xdmf

Lines changed: 528 additions & 528 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
33475f722f1e39e0952cc121e6e0a59f
1+
da07b8f9d636f825356220f5c90e6d28
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
72f7ff57a40b26f1f39511259e4dbbfc
1+
db939420c8685ba238dfbcd8a3c0d1ca
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3189b1a625401dc9fd9209e55192cab2
1+
8179f563e937a02c1887541f29efe58f

python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml renamed to python/tests/resources/Result/singlePhase.yaml

File renamed without changes.

python/tests/test_Result.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def default(tmp_path,res_path):
3737
@pytest.fixture
3838
def single_phase(tmp_path,res_path):
3939
"""Single phase Result file in temp location for modification."""
40-
fname = '6grains6x7x8_single_phase_tensionY.hdf5'
40+
fname = '6grains6x7x8_tensionY_singlePhase.hdf5'
4141
shutil.copy(res_path/fname,tmp_path)
4242
return Result(tmp_path/fname)
4343

@@ -447,7 +447,7 @@ def test_coordinates(self,default,mode):
447447
@pytest.mark.parametrize('output',['F','*',['P'],['P','F']],ids=range(4))
448448
@pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5',
449449
'4grains2x4x3_compressionY.hdf5',
450-
'6grains6x7x8_single_phase_tensionY.hdf5'],ids=range(3))
450+
'6grains6x7x8_tensionY_singlePhase.hdf5'],ids=range(3))
451451
@pytest.mark.parametrize('inc',[4,0],ids=range(2))
452452
@pytest.mark.xfail(vtkVersion.GetVTKMajorVersion()<9, reason='missing "Direction" attribute')
453453
def test_export_vtk(self,request,tmp_path,res_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc):
@@ -669,7 +669,7 @@ def test_export_simulation_setup_content(self,res_path,tmp_path,default,output):
669669
assert open(tmp_path/output).read() == open(res_path/output).read()
670670

671671
@pytest.mark.parametrize('fname',['4grains2x4x3_compressionY.hdf5',
672-
'6grains6x7x8_single_phase_tensionY.hdf5'])
672+
'6grains6x7x8_tensionY_singlePhase.hdf5'])
673673
@pytest.mark.parametrize('output',['material.yaml','*'])
674674
def test_export_simulation_setup_consistency(self,res_path,tmp_path,fname,output):
675675
r = Result(res_path/fname)
@@ -691,7 +691,7 @@ def test_export_simulation_setup_custom_path(self,res_path,tmp_path):
691691
assert 'material.yaml' in os.listdir(absdir); (absdir/'material.yaml').unlink()
692692

693693
@pytest.mark.parametrize('fname',['4grains2x4x3_compressionY.hdf5',
694-
'6grains6x7x8_single_phase_tensionY.hdf5',
694+
'6grains6x7x8_tensionY_singlePhase.hdf5',
695695
'12grains6x7x8_tensionY.hdf5',
696696
'check_compile_job1.hdf5',])
697697
def test_export_DADF5(self,np_rng,res_path,tmp_path,fname):
@@ -705,14 +705,14 @@ def test_export_DADF5(self,np_rng,res_path,tmp_path,fname):
705705
assert str(r.place()) == str(r_exp.place())
706706

707707
@pytest.mark.parametrize('fname',['4grains2x4x3_compressionY.hdf5',
708-
'6grains6x7x8_single_phase_tensionY.hdf5'])
708+
'6grains6x7x8_tensionY_singlePhase.hdf5'])
709709
def test_export_DADF5_name_clash(self,res_path,tmp_path,fname):
710710
r = Result(res_path/fname)
711711
with pytest.raises(PermissionError):
712712
r.export_DADF5(r.fname)
713713

714714
@pytest.mark.parametrize('fname',['4grains2x4x3_compressionY.hdf5',
715-
'6grains6x7x8_single_phase_tensionY.hdf5',
715+
'6grains6x7x8_tensionY_singlePhase.hdf5',
716716
'12grains6x7x8_tensionY.hdf5'])
717717
def test_export_DADF5_regrid(self,res_path,tmp_path,fname):
718718
r = Result(res_path/fname)

0 commit comments

Comments
 (0)