Modifications in preparation to MAX IV experiment
This commit is contained in:
@@ -218,7 +218,7 @@ HDF5Fapl::~HDF5Fapl() {
|
||||
H5Pclose(id);
|
||||
}
|
||||
|
||||
void HDF5Fapl::SetVersionToLatest() {
|
||||
void HDF5Fapl::SetVersionTo1p10orNewer() {
|
||||
H5Pset_libver_bounds(id, H5F_LIBVER_V110, H5F_LIBVER_LATEST);
|
||||
}
|
||||
|
||||
@@ -397,10 +397,10 @@ HDF5Group::~HDF5Group() {
|
||||
H5Gclose(id);
|
||||
}
|
||||
|
||||
HDF5File::HDF5File(const std::string& filename, bool create, bool hdf5_latest, bool swmr) : HDF5Object() {
|
||||
HDF5File::HDF5File(const std::string& filename, bool create, bool swmr) : HDF5Object() {
|
||||
HDF5Fapl fapl;
|
||||
if (create) {
|
||||
if (hdf5_latest) fapl.SetVersionToLatest();
|
||||
fapl.SetVersionTo1p10orNewer();
|
||||
id = H5Fcreate(filename.c_str(), H5F_ACC_TRUNC | (swmr ? H5F_ACC_SWMR_WRITE : 0), H5P_DEFAULT, fapl.GetID());
|
||||
} else
|
||||
id = H5Fopen(filename.c_str(), H5F_ACC_RDWR | (swmr ? H5F_ACC_SWMR_WRITE : 0), H5P_DEFAULT);
|
||||
@@ -464,7 +464,7 @@ HDF5DataSet::HDF5DataSet(const HDF5Object &parent, const std::string &name) : nd
|
||||
|
||||
void HDF5DataSet::SetExtent(const std::vector<hsize_t> &dims) {
|
||||
if (dims.size() != ndim)
|
||||
throw JFJochException(JFJochExceptionCategory::HDF5, "Mismatch in dataset dimensions");
|
||||
throw JFJochException(JFJochExceptionCategory::HDF5, "Mismatch in dataset dimensions " + std::to_string(ndim));
|
||||
herr_t ret = H5Dset_extent(id, dims.data());
|
||||
if (ret < 0)
|
||||
throw JFJochException(JFJochExceptionCategory::HDF5, "Error in H5Dset_extent");
|
||||
|
||||
Reference in New Issue
Block a user