summaryrefslogtreecommitdiff
path: root/openEMS/tools
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2018-08-13 09:26:34 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2018-08-13 09:26:34 +0200
commit7097a4eaa0a32e0d02207521941157bda8968b05 (patch)
treed4b1258d2601508182f8ff8b992d7e9431a7d20a /openEMS/tools
parentaa7abb5c97c20b34f159886dfc523dd8198fef98 (diff)
New upstream version 0.0.35+ds.1
Diffstat (limited to 'openEMS/tools')
-rw-r--r--openEMS/tools/hdf5_file_reader.cpp4
-rw-r--r--openEMS/tools/hdf5_file_writer.cpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/openEMS/tools/hdf5_file_reader.cpp b/openEMS/tools/hdf5_file_reader.cpp
index 5e81614..a6e1359 100644
--- a/openEMS/tools/hdf5_file_reader.cpp
+++ b/openEMS/tools/hdf5_file_reader.cpp
@@ -68,7 +68,7 @@ bool HDF5_File_Reader::OpenGroup(hid_t &file, hid_t &group, string groupName)
return 0;
}
- group = H5Gopen(file, groupName.c_str() );
+ group = H5Gopen(file, groupName.c_str(), H5P_DEFAULT );
if (group<0)
{
cerr << "HDF5_File_Reader::OpenGroup: can't open group """ << groupName << """" << endl;
@@ -198,7 +198,7 @@ bool HDF5_File_Reader::ReadDataSet(string ds_name, hsize_t &nDim, hsize_t* &dims
return false;
}
- hid_t dataset = H5Dopen(hdf5_file, ds_name.c_str() );
+ hid_t dataset = H5Dopen(hdf5_file, ds_name.c_str(), H5P_DEFAULT );
if (dataset<0)
{
cerr << "HDF5_File_Reader::ReadDataSet: dataset not found" << endl;
diff --git a/openEMS/tools/hdf5_file_writer.cpp b/openEMS/tools/hdf5_file_writer.cpp
index 81c5692..e3a2113 100644
--- a/openEMS/tools/hdf5_file_writer.cpp
+++ b/openEMS/tools/hdf5_file_writer.cpp
@@ -52,7 +52,7 @@ hid_t HDF5_File_Writer::OpenGroup(hid_t hdf5_file, string group)
vector<string> results;
boost::split(results, group, boost::is_any_of("/"));
- hid_t grp=H5Gopen(hdf5_file,"/");
+ hid_t grp=H5Gopen(hdf5_file,"/", H5P_DEFAULT);
if (grp<0)
{
cerr << "HDF5_File_Writer::OpenGroup: Error, opening root group " << endl;
@@ -66,7 +66,7 @@ hid_t HDF5_File_Writer::OpenGroup(hid_t hdf5_file, string group)
{
if (H5Lexists(grp, results.at(n).c_str(), H5P_DEFAULT))
{
- grp = H5Gopen(grp, results.at(n).c_str());
+ grp = H5Gopen(grp, results.at(n).c_str(), H5P_DEFAULT);
H5Gclose(old_grp);
if (grp<0)
{
@@ -76,7 +76,7 @@ hid_t HDF5_File_Writer::OpenGroup(hid_t hdf5_file, string group)
}
else
{
- grp = H5Gcreate(grp,results.at(n).c_str(),0);
+ grp = H5Gcreate(grp,results.at(n).c_str(), H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
H5Gclose(old_grp);
if (grp<0)
{
@@ -140,7 +140,7 @@ bool HDF5_File_Writer::WriteRectMesh(unsigned int const* numLines, float const*
return false;
}
- hid_t mesh_grp = H5Gcreate(hdf5_file,"/Mesh",0);
+ hid_t mesh_grp = H5Gcreate(hdf5_file,"/Mesh", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
if (mesh_grp<0)
{
cerr << "HDF5_File_Writer::WriteRectMesh: Error, creating group ""/Mesh"" failed" << endl;
@@ -165,7 +165,7 @@ bool HDF5_File_Writer::WriteRectMesh(unsigned int const* numLines, float const*
{
hsize_t dims[1]={numLines[n]};
hid_t space = H5Screate_simple(1, dims, NULL);
- hid_t dataset = H5Dcreate(mesh_grp, names[n].c_str(), H5T_NATIVE_FLOAT, space, H5P_DEFAULT);
+ hid_t dataset = H5Dcreate(mesh_grp, names[n].c_str(), H5T_NATIVE_FLOAT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
float* array = new float[numLines[n]];
for (unsigned int i=0; i<numLines[n]; ++i)
{
@@ -408,7 +408,7 @@ bool HDF5_File_Writer::WriteData(std::string dataSetName, hid_t mem_type, void
for (size_t n=0;n<dim;++n)
dims[n]=datasize[n];
hid_t space = H5Screate_simple(dim, dims, NULL);
- hid_t dataset = H5Dcreate(group, dataSetName.c_str(), mem_type, space, H5P_DEFAULT);
+ hid_t dataset = H5Dcreate(group, dataSetName.c_str(), mem_type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
if (H5Dwrite(dataset, mem_type, space, H5P_DEFAULT, H5P_DEFAULT, field_buf))
{
cerr << "HDF5_File_Writer::WriteData: Error, writing to dataset failed" << endl;
@@ -451,7 +451,7 @@ bool HDF5_File_Writer::WriteAtrribute(std::string locName, std::string attr_name
hid_t dataspace_id = H5Screate_simple(1, &size, NULL);
/* Create a dataset attribute. */
- hid_t attribute_id = H5Acreate(loc, attr_name.c_str(), mem_type, dataspace_id,H5P_DEFAULT);
+ hid_t attribute_id = H5Acreate(loc, attr_name.c_str(), mem_type, dataspace_id, H5P_DEFAULT, H5P_DEFAULT);
if (attribute_id<0)
{
cerr << "HDF5_File_Writer::WriteAtrribute: Error, failed to create the attrbute" << endl;