diff options
| author | knarf <knarf@cct.lsu.edu> | 2012-04-17 08:50:04 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-09-11 18:23:15 +0100 |
| commit | 17b3d85fb1388203a5d7eb8f4a9b9c004b1db414 (patch) | |
| tree | 65788c1139cab75fa8db795ad8ada36fb5bd4f48 /Carpet/CarpetIOHDF5 | |
| parent | e92bddde590f89cb69193ef8256180aa34123450 (diff) | |
CarpetIOHDF5: use version 1.6 of the HDF5 API within hdf5_recombiner
There are still systems with only version 1.6 installed, or broken installs
of version 1.8 (Debian system packages at least up to squeeze). These
systems benefit from a compiling hdf5_recombiner, while version 1.8 is
not really required to be used here.
Diffstat (limited to 'Carpet/CarpetIOHDF5')
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc b/Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc index ecee483d3..b3229d6ed 100644 --- a/Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc +++ b/Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc @@ -6,6 +6,7 @@ #include <string> #include <vector> +#define H5_USE_16_API 1 #include <cctk_Config.h> #include <hdf5.h> @@ -87,10 +88,10 @@ int main (int argc, char **argv) hid_t const output_dataset = file_exists ? - H5Dopen (output_file, output_dataset_name, H5P_DEFAULT) : + H5Dopen (output_file, output_dataset_name) : H5Dcreate (output_file, output_dataset_name, output_datatype, output_dataspace, - H5P_DEFAULT, output_properties, H5P_DEFAULT); + output_properties); assert (output_dataset >= 0); @@ -137,7 +138,7 @@ int main (int argc, char **argv) int const iteration = it / iteration_divisor; hid_t const input_dataset = - H5Dopen (input_file, input_dataset_name, H5P_DEFAULT); + H5Dopen (input_file, input_dataset_name); assert (input_dataset >= 0); int iorigin[dim]; |