diff --git a/core/io.c b/core/io.c index 58143f7..ac4e338 100644 --- a/core/io.c +++ b/core/io.c @@ -1519,6 +1519,7 @@ void restart_read(char *fname) { nph_in += dset_sizes[n]; } H5Sclose(space); + H5Dclose(ph_dsets[n]); } printf("[%i] nph_in = %lu\n", mpi_myrank(), (unsigned long int)nph_in); // Actually read datasets @@ -1527,8 +1528,11 @@ void restart_read(char *fname) { int noffset = 0; for (int n = 0; n < num_datasets; n++) { if (n % mpi_nprocs() == mpi_myrank()) { + sprintf(dsetnam, "photons_%08d", n); + ph_dsets[n] = H5Dopen(file_id, dsetnam, H5P_DEFAULT); H5Dread(ph_dsets[n], phmemtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata[noffset]); + H5Dclose(ph_dsets[n]); noffset += dset_sizes[n]; } } @@ -1573,9 +1577,6 @@ void restart_read(char *fname) { } free(rdata); - for (int n = 0; n < num_datasets; n++) { - H5Dclose(ph_dsets[n]); - } free(ph_dsets); free(dset_sizes); #endif // RADIATION diff --git a/script/machine/debian.py b/script/machine/debian.py index d3fc72a..a820a41 100644 --- a/script/machine/debian.py +++ b/script/machine/debian.py @@ -39,7 +39,8 @@ def get_options(): host = {} host['NAME'] = os.uname()[1] - host['COMPILER'] = '/usr/local/hdf5-parallel/bin/h5pcc' + #host['COMPILER'] = '/usr/local/hdf5-parallel/bin/h5pcc' + host['COMPILER'] = 'h5pcc' host['COMPILER_FLAGS'] = flags_base + ' ' + fcflags + ' ' + '-O2 -march=native' host['DEBUG_FLAGS'] = flags_base + ' ' + fcflags + ' ' + '-g -O0' host['GSL_DIR'] = ''