From 17b3d85fb1388203a5d7eb8f4a9b9c004b1db414 Mon Sep 17 00:00:00 2001 From: knarf Date: Tue, 17 Apr 2012 08:50:04 -0500 Subject: 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. --- Carpet/CarpetIOHDF5/src/util/hdf5_recombiner.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Carpet/CarpetIOHDF5/src') 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 #include +#define H5_USE_16_API 1 #include #include @@ -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]; -- cgit v1.2.3