diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/h5dump.c | 1 | ||||
| -rw-r--r-- | tools/h5dump/h5dumpgentest.c | 4 | ||||
| -rw-r--r-- | tools/testfiles/tmulti-l.h5 | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-o.h5 | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-r.h5 | bin | 600 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-s.h5 | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tsplit_file-m.h5 | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tsplit_file-r.h5 | bin | 600 -> 2048 bytes |
8 files changed, 5 insertions, 0 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 8386551..6b9f31a 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -6223,6 +6223,7 @@ h5_fileaccess(void) assert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES); for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { memb_fapl[mt] = H5P_DEFAULT; + memb_map[mt] = mt; sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); memb_name[mt] = sv[mt]; memb_addr[mt] = MAX(mt-1,0)*(HADDR_MAX/10); diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 83f009a..f7355fb 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -3026,10 +3026,13 @@ void gent_multi(void) for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { memb_fapl[mt] = H5P_DEFAULT; + memb_map[mt] = mt; sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); memb_name[mt] = sv[mt]; +/*printf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/ memb_addr[mt] = MAX(mt - 1,0) * (HADDR_MAX / 10); } + memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER; H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE); @@ -3047,6 +3050,7 @@ void gent_multi(void) dset[i][j] = i + j; H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset); + H5Sclose(space); H5Dclose(dataset); H5Fclose(fid); diff --git a/tools/testfiles/tmulti-l.h5 b/tools/testfiles/tmulti-l.h5 Binary files differindex 8b01fc6..42fe396 100644 --- a/tools/testfiles/tmulti-l.h5 +++ b/tools/testfiles/tmulti-l.h5 diff --git a/tools/testfiles/tmulti-o.h5 b/tools/testfiles/tmulti-o.h5 Binary files differindex 35c1998..b433ee8 100644 --- a/tools/testfiles/tmulti-o.h5 +++ b/tools/testfiles/tmulti-o.h5 diff --git a/tools/testfiles/tmulti-r.h5 b/tools/testfiles/tmulti-r.h5 Binary files differindex eb08e79..928d4d5 100644 --- a/tools/testfiles/tmulti-r.h5 +++ b/tools/testfiles/tmulti-r.h5 diff --git a/tools/testfiles/tmulti-s.h5 b/tools/testfiles/tmulti-s.h5 Binary files differindex 5b4ef20..3feae49 100644 --- a/tools/testfiles/tmulti-s.h5 +++ b/tools/testfiles/tmulti-s.h5 diff --git a/tools/testfiles/tsplit_file-m.h5 b/tools/testfiles/tsplit_file-m.h5 Binary files differindex 09db115..a6eef73 100644 --- a/tools/testfiles/tsplit_file-m.h5 +++ b/tools/testfiles/tsplit_file-m.h5 diff --git a/tools/testfiles/tsplit_file-r.h5 b/tools/testfiles/tsplit_file-r.h5 Binary files differindex eb08e79..928d4d5 100644 --- a/tools/testfiles/tsplit_file-r.h5 +++ b/tools/testfiles/tsplit_file-r.h5 |