diff --git a/python/damask/_result.py b/python/damask/_result.py
index c545b52e8..83c1e8298 100644
--- a/python/damask/_result.py
+++ b/python/damask/_result.py
@@ -106,7 +106,7 @@ class Result:
self.version_major = f.attrs['DADF5_version_major']
self.version_minor = f.attrs['DADF5_version_minor']
- if self.version_major != 0 or not 12 <= self.version_minor <= 14:
+ if (self.version_major != 0 or not 12 <= self.version_minor <= 14) and self.version_major != 1:
raise TypeError(f'unsupported DADF5 version "{self.version_major}.{self.version_minor}"')
if self.version_major == 0 and self.version_minor < 14:
self.export_simulation_setup = None # type: ignore
diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY.hdf5
index de5082a0d..84e5bb73e 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
deleted file mode 100644
index d3c5a8004..000000000
Binary files a/python/tests/reference/Result/12grains6x7x8_tensionY_restart.hdf5 and /dev/null differ
diff --git a/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5 b/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5
deleted file mode 100644
index 64430ba9a..000000000
Binary files a/python/tests/reference/Result/12grains6x7x8_tensionY_restart_restart.hdf5 and /dev/null differ
diff --git a/python/tests/reference/Result/4grains2x4x3_compressionY.hdf5 b/python/tests/reference/Result/4grains2x4x3_compressionY.hdf5
index 2d1d0ee33..041feca39 100644
Binary files a/python/tests/reference/Result/4grains2x4x3_compressionY.hdf5 and b/python/tests/reference/Result/4grains2x4x3_compressionY.hdf5 differ
diff --git a/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.hdf5 b/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.hdf5
index cb7838332..eb3f73ea4 100644
Binary files a/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.hdf5 and b/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.hdf5 differ
diff --git a/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.xdmf b/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.xdmf
index cc92cd571..80b96fecb 100644
--- a/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.xdmf
+++ b/python/tests/reference/Result/6grains6x7x8_single_phase_tensionY.xdmf
@@ -26,7 +26,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_0/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_0/phase/pheno_fcc/mechanical/O
@@ -177,7 +177,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_4/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_4/phase/pheno_fcc/mechanical/O
@@ -328,7 +328,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_8/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_8/phase/pheno_fcc/mechanical/O
@@ -479,7 +479,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_12/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_12/phase/pheno_fcc/mechanical/O
@@ -630,7 +630,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_16/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_16/phase/pheno_fcc/mechanical/O
@@ -781,7 +781,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_20/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_20/phase/pheno_fcc/mechanical/O
@@ -932,7 +932,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_24/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_24/phase/pheno_fcc/mechanical/O
@@ -1083,7 +1083,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_28/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_28/phase/pheno_fcc/mechanical/O
@@ -1234,7 +1234,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_32/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_32/phase/pheno_fcc/mechanical/O
@@ -1385,7 +1385,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_36/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_36/phase/pheno_fcc/mechanical/O
@@ -1536,7 +1536,7 @@
6grains6x7x8_single_phase_tensionY.hdf5:increment_40/phase/pheno_fcc/mechanical/L_p
-
+
6grains6x7x8_single_phase_tensionY.hdf5:increment_40/phase/pheno_fcc/mechanical/O
diff --git a/python/tests/reference/Result/check_compile_job1.hdf5 b/python/tests/reference/Result/check_compile_job1.hdf5
index 2634c26ce..597598ebf 100644
Binary files a/python/tests/reference/Result/check_compile_job1.hdf5 and b/python/tests/reference/Result/check_compile_job1.hdf5 differ
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
index 20beaee70..281d96e64 100644
--- 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
@@ -1 +1 @@
-27972d6a0955e4e6e27a6ac5762abda8
+c7280da4e7cb4d993b9d26d0285cf85e
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-0].md5
new file mode 100644
index 000000000..9c015ae9c
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-0].md5
@@ -0,0 +1 @@
+b1d4ed9f72a7a2a261ca4c8c7ce3ecca
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-1].md5
new file mode 100644
index 000000000..d0e1348fb
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-1].md5
@@ -0,0 +1 @@
+fa58dc50516d0e31c7b84ea06728c477
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-2].md5
new file mode 100644
index 000000000..37884253d
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-2].md5
@@ -0,0 +1 @@
+db4278b2b1a3cd854595dd62eeef7ac4
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-3].md5
new file mode 100644
index 000000000..e61abb341
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-1-3].md5
@@ -0,0 +1 @@
+e8fe1c752a781f31bd5edd79976c58d9
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-0].md5
new file mode 100644
index 000000000..81e726dd2
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-0].md5
@@ -0,0 +1 @@
+33475f722f1e39e0952cc121e6e0a59f
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-1].md5
new file mode 100644
index 000000000..fd43d041e
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-1].md5
@@ -0,0 +1 @@
+72f7ff57a40b26f1f39511259e4dbbfc
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-2].md5
new file mode 100644
index 000000000..89394e076
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-2].md5
@@ -0,0 +1 @@
+0861eb141de14a929e4f32aa87bba99f
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-3].md5
new file mode 100644
index 000000000..01a8edc31
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[0-2-3].md5
@@ -0,0 +1 @@
+3189b1a625401dc9fd9209e55192cab2
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
index 9f551820c..162f7f7ec 100644
--- 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
@@ -1 +1 @@
-dd71d25ccb52c3fdfd2ab727fc852a98
+53598d0052bf9ddfdf6d755cd375e015
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-0].md5
new file mode 100644
index 000000000..6da5f50e3
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-0].md5
@@ -0,0 +1 @@
+472e040094eaed7cceb6cdcc82a08e8f
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-1].md5
new file mode 100644
index 000000000..8c018818b
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-1].md5
@@ -0,0 +1 @@
+83c0accce11142b5b0b6be7ee56c0d5a
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-2].md5
new file mode 100644
index 000000000..3918fd9f9
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-2].md5
@@ -0,0 +1 @@
+06de227b18a955cb5b2ea325b4e22fc6
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-3].md5
new file mode 100644
index 000000000..2dba8e10a
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-1-3].md5
@@ -0,0 +1 @@
+ed793b6089fda37453731d5f820581bd
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-0].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-0].md5
new file mode 100644
index 000000000..f07a3ee2e
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-0].md5
@@ -0,0 +1 @@
+4f85d2613aa70622a2d5f49dc8bf2eb2
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-1].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-1].md5
new file mode 100644
index 000000000..9c0e9da4c
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-1].md5
@@ -0,0 +1 @@
+0aca2c9895589569da20459e64ff58a2
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-2].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-2].md5
new file mode 100644
index 000000000..af7491c0b
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-2].md5
@@ -0,0 +1 @@
+878d7ae32630ec6651fffe7e1b91048d
diff --git a/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-3].md5 b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-3].md5
new file mode 100644
index 000000000..4581947a3
--- /dev/null
+++ b/python/tests/reference/Result/export_VTK/test_export_vtk[1-2-3].md5
@@ -0,0 +1 @@
+9c5b55db21eec2ea0b1c784684b746b6
diff --git a/python/tests/test_Result.py b/python/tests/test_Result.py
index f0de16937..1e95c95de 100644
--- a/python/tests/test_Result.py
+++ b/python/tests/test_Result.py
@@ -385,7 +385,9 @@ class TestResult:
assert np.allclose(a,b)
@pytest.mark.parametrize('output',['F','*',['P'],['P','F']],ids=range(4))
- @pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5'],ids=range(1))
+ @pytest.mark.parametrize('fname',['12grains6x7x8_tensionY.hdf5',
+ '4grains2x4x3_compressionY.hdf5',
+ '6grains6x7x8_single_phase_tensionY.hdf5'],ids=range(3))
@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_export_vtk(self,request,tmp_path,ref_path,update,patch_execution_stamp,patch_datetime_now,output,fname,inc):
@@ -395,8 +397,8 @@ class TestResult:
v = VTK.load(tmp_path/fname)
v.comments = ['n/a']
v.save(tmp_path/fname,parallel=False)
- with open(tmp_path/fname) as f:
- cur = hashlib.md5(f.read().encode()).hexdigest()
+ with open(tmp_path/fname,'rb') as f:
+ cur = hashlib.md5(f.read()).hexdigest()
if update:
with open((ref_path/'export_VTK'/request.node.name).with_suffix('.md5'),'w') as f:
f.write(cur+'\n')
diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90
index 6f5a85815..451e450ee 100644
--- a/src/grid/grid_mech_spectral_basic.f90
+++ b/src/grid/grid_mech_spectral_basic.f90
@@ -115,11 +115,6 @@ subroutine grid_mechanical_spectral_basic_init()
PetscInt, dimension(0:worldsize-1) :: localK
real(pReal), dimension(3,3,product(cells(1:2))*cells3) :: temp33n
integer(HID_T) :: fileHandle, groupHandle
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY)
- type(MPI_File) :: fileUnit
-#else
- integer :: fileUnit
-#endif
type(tDict), pointer :: &
num_grid
type(tList), pointer :: &
diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90
index 52b20dfbd..d46880c85 100644
--- a/src/grid/grid_mech_spectral_polarisation.f90
+++ b/src/grid/grid_mech_spectral_polarisation.f90
@@ -128,11 +128,6 @@ subroutine grid_mechanical_spectral_polarisation_init()
PetscInt, dimension(0:worldsize-1) :: localK
real(pReal), dimension(3,3,product(cells(1:2))*cells3) :: temp33n
integer(HID_T) :: fileHandle, groupHandle
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR>14) && !defined(PETSC_HAVE_MPI_F90MODULE_VISIBILITY)
- type(MPI_File) :: fileUnit
-#else
- integer :: fileUnit
-#endif
type(tDict), pointer :: &
num_grid
type(tList), pointer :: &
@@ -140,6 +135,7 @@ subroutine grid_mechanical_spectral_polarisation_init()
character(len=pStringLen) :: &
extmsg = ''
+
print'(/,1x,a)', '<<<+- grid_mechanical_spectral_polarization init -+>>>'; flush(IO_STDOUT)
print'(/,1x,a)', 'P. Shanthraj et al., International Journal of Plasticity 66:31–45, 2015'
diff --git a/src/result.f90 b/src/result.f90
index 6c4f7de82..46471e289 100644
--- a/src/result.f90
+++ b/src/result.f90
@@ -83,8 +83,8 @@ subroutine result_init(restart)
if (.not. restart) then
resultFile = HDF5_openFile(getSolverJobName()//'.hdf5','w')
- call result_addAttribute('DADF5_version_major',0)
- call result_addAttribute('DADF5_version_minor',14)
+ call result_addAttribute('DADF5_version_major',1)
+ call result_addAttribute('DADF5_version_minor',0)
call get_command_argument(0,commandLine)
call result_addAttribute('creator',trim(commandLine)//' '//DAMASKVERSION)
call result_addAttribute('created',now())