[cig-commits] commit: Use the 1.8 HDF5 API explicitly
Mercurial
hg at geodynamics.org
Fri Feb 25 14:10:07 PST 2011
changeset: 4:49006e096d2a
user: Walter Landry <wlandry at caltech.edu>
date: Mon Jan 03 15:09:04 2011 -0800
files: source/SAMRAI/appu/VisItDataWriter.C source/SAMRAI/tbox/HDFDatabase.C source/test/restartdb/mainHDF5AppFileOpen.C
description:
Use the 1.8 HDF5 API explicitly
diff -r 045ab713ab35 -r 49006e096d2a source/SAMRAI/appu/VisItDataWriter.C
--- a/source/SAMRAI/appu/VisItDataWriter.C Sat Jan 01 22:25:03 2011 -0800
+++ b/source/SAMRAI/appu/VisItDataWriter.C Mon Jan 03 15:09:04 2011 -0800
@@ -4591,8 +4591,8 @@ void VisItDataWriter::HDFputIntegerArray
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
H5T_NATIVE_INT,
space,
@@ -4661,8 +4661,8 @@ void VisItDataWriter::HDFputDoubleArray2
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
H5T_NATIVE_DOUBLE,
space,
@@ -4735,15 +4735,15 @@ void VisItDataWriter::HDFputPatchExtents
hsize_t dim1[1];
dim1[0] = VISIT_FIXED_DIM;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t intXdType = H5Tarray_create(H5T_NATIVE_INT, 1, dim1);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t intXdType = H5Tarray_create2(H5T_NATIVE_INT, 1, dim1);
#else
hid_t intXdType = H5Tarray_create(H5T_NATIVE_INT, 1, dim1, NULL);
#endif
TBOX_ASSERT(intXdType >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t doubleXdType = H5Tarray_create(H5T_NATIVE_DOUBLE, 1, dim1);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t doubleXdType = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, dim1);
#else
hid_t doubleXdType = H5Tarray_create(H5T_NATIVE_DOUBLE, 1, dim1, NULL);
#endif
@@ -4774,8 +4774,8 @@ void VisItDataWriter::HDFputPatchExtents
doubleXdType);
TBOX_ASSERT(errf >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
pe_id,
space,
@@ -4882,8 +4882,8 @@ void VisItDataWriter::HDFputPatchMapStru
H5T_NATIVE_INT);
TBOX_ASSERT(errf >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
pm_id,
space,
@@ -4984,8 +4984,8 @@ void VisItDataWriter::HDFputPatchMinMaxS
H5T_NATIVE_DOUBLE);
TBOX_ASSERT(errf >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
s1_tid,
space,
@@ -5071,8 +5071,8 @@ void VisItDataWriter::HDFputChildParentS
H5T_NATIVE_INT);
TBOX_ASSERT(errf >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(group_id,
key.c_str(),
s1_tid,
space,
diff -r 045ab713ab35 -r 49006e096d2a source/SAMRAI/tbox/HDFDatabase.C
--- a/source/SAMRAI/tbox/HDFDatabase.C Sat Jan 01 22:25:03 2011 -0800
+++ b/source/SAMRAI/tbox/HDFDatabase.C Mon Jan 03 15:09:04 2011 -0800
@@ -82,18 +82,18 @@
/*
* SGS Note: Can the new HDF5 stack stuff be a better solution to this?
*/
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
#define BEGIN_SUPPRESS_HDF5_WARNINGS \
{ \
herr_t (* H5E_saved_efunc)( \
hid_t, \
void *) = NULL; \
void* H5E_saved_edata = NULL; \
- H5Eget_auto(H5E_DEFAULT, &H5E_saved_efunc, &H5E_saved_edata); \
- H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto2(H5E_DEFAULT, &H5E_saved_efunc, &H5E_saved_edata); \
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
#define END_SUPPRESS_HDF5_WARNINGS \
- H5Eset_auto(H5E_DEFAULT, H5E_saved_efunc, H5E_saved_edata); \
+ H5Eset_auto2(H5E_DEFAULT, H5E_saved_efunc, H5E_saved_edata); \
}
#else
#define BEGIN_SUPPRESS_HDF5_WARNINGS \
@@ -146,8 +146,8 @@ herr_t HDFDatabase::iterateKeys(
addKeyToList(name, KEY_DATABASE, void_database);
} else if (!strcmp(name, database->d_group_to_search.c_str())) {
hid_t grp;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- grp = H5Gopen(loc_id, name, H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ grp = H5Gopen2(loc_id, name, H5P_DEFAULT);
#else
grp = H5Gopen(loc_id, name);
#endif
@@ -164,8 +164,8 @@ herr_t HDFDatabase::iterateKeys(
} else {
hid_t grp;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- grp = H5Gopen(loc_id, name, H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ grp = H5Gopen2(loc_id, name, H5P_DEFAULT);
#else
grp = H5Gopen(loc_id, name);
#endif
@@ -189,8 +189,8 @@ herr_t HDFDatabase::iterateKeys(
if (database->d_still_searching && database->d_found_group) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(loc_id, name, H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(loc_id, name, H5P_DEFAULT);
#else
this_set = H5Dopen(loc_id, name);
#endif
@@ -351,8 +351,8 @@ bool HDFDatabase::keyExists(
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -367,8 +367,8 @@ bool HDFDatabase::keyExists(
hid_t this_group;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_group = H5Gopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_group = H5Gopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_group = H5Gopen(d_group_id, key.c_str());
#endif
@@ -432,8 +432,8 @@ enum Database::DataType HDFDatabase::get
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -526,8 +526,8 @@ int HDFDatabase::getArraySize(
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -579,8 +579,8 @@ bool HDFDatabase::isDatabase(
hid_t this_group;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_group = H5Gopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_group = H5Gopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_group = H5Gopen(d_group_id, key.c_str());
#endif
@@ -609,8 +609,8 @@ HDFDatabase::putDatabase(
{
TBOX_ASSERT(!key.empty());
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t this_group = H5Gcreate(d_group_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t this_group = H5Gcreate2(d_group_id,
key.c_str(), 0, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t this_group = H5Gcreate(d_group_id, key.c_str(), 0);
@@ -643,8 +643,8 @@ HDFDatabase::getDatabase(
<< "\n Key = " << key << " is not a database." << std::endl);
}
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t this_group = H5Gopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t this_group = H5Gopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
hid_t this_group = H5Gopen(d_group_id, key.c_str());
#endif
@@ -675,8 +675,8 @@ bool HDFDatabase::isBool(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -733,8 +733,8 @@ void HDFDatabase::putBoolArray(
Array<int> data1(nelements);
for (int i = 0; i < nelements; ++i) data1[i] = data[i];
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_BOOL,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(d_group_id, key.c_str(), H5T_SAMRAI_BOOL,
space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_BOOL,
@@ -790,8 +790,8 @@ Array<bool> HDFDatabase::getBoolArray(
herr_t errf;
NULL_USE(errf);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -855,8 +855,8 @@ bool HDFDatabase::isDatabaseBox(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -903,9 +903,9 @@ void HDFDatabase::putDatabaseBoxArray(
hsize_t length = nelements;
hid_t space = H5Screate_simple(1, &length, NULL);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
hid_t dataset =
- H5Dcreate(d_group_id, key.c_str(), stype, space, H5P_DEFAULT,
+ H5Dcreate2(d_group_id, key.c_str(), stype, space, H5P_DEFAULT,
H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset =
@@ -969,8 +969,8 @@ Array<DatabaseBox> HDFDatabase::getDatab
// Memory type
hid_t mtype = createCompoundDatabaseBox('n');
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1067,8 +1067,8 @@ bool HDFDatabase::isChar(
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1128,8 +1128,8 @@ void HDFDatabase::putCharArray(
space = H5Screate(H5S_SCALAR);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dataset = H5Dcreate(d_group_id, key.c_str(), atype, space,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dataset = H5Dcreate2(d_group_id, key.c_str(), atype, space,
H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
dataset = H5Dcreate(d_group_id, key.c_str(), atype, space,
@@ -1190,8 +1190,8 @@ Array<char> HDFDatabase::getCharArray(
herr_t errf;
NULL_USE(errf);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1245,8 +1245,8 @@ bool HDFDatabase::isComplex(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1298,8 +1298,8 @@ void HDFDatabase::putComplexArray(
space = H5Screate_simple(1, dim, NULL);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dataset = H5Dcreate(d_group_id, key.c_str(), stype, space,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dataset = H5Dcreate2(d_group_id, key.c_str(), stype, space,
H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
dataset = H5Dcreate(d_group_id, key.c_str(), stype, space,
@@ -1364,8 +1364,8 @@ Array<dcomplex> HDFDatabase::getComplexA
// Memory type
hid_t mtype = createCompoundComplex('n');
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1450,8 +1450,8 @@ bool HDFDatabase::isDouble(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1495,8 +1495,8 @@ void HDFDatabase::putDoubleArray(
hid_t space = H5Screate_simple(1, dim, NULL);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_DOUBLE,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(d_group_id, key.c_str(), H5T_SAMRAI_DOUBLE,
space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_DOUBLE,
@@ -1553,8 +1553,8 @@ Array<double> HDFDatabase::getDoubleArra
hid_t dset, dspace;
hsize_t nsel;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1603,8 +1603,8 @@ bool HDFDatabase::isFloat(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1648,8 +1648,8 @@ void HDFDatabase::putFloatArray(
hid_t space = H5Screate_simple(1, dim, NULL);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_FLOAT,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(d_group_id, key.c_str(), H5T_SAMRAI_FLOAT,
space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_FLOAT,
@@ -1707,8 +1707,8 @@ Array<float> HDFDatabase::getFloatArray(
hid_t dset, dspace;
hsize_t nsel;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1758,8 +1758,8 @@ bool HDFDatabase::isInteger(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1804,8 +1804,8 @@ void HDFDatabase::putIntegerArray(
hid_t space = H5Screate_simple(1, dim, NULL);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_INT,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(d_group_id, key.c_str(), H5T_SAMRAI_INT,
space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset = H5Dcreate(d_group_id, key.c_str(), H5T_SAMRAI_INT,
@@ -1862,8 +1862,8 @@ Array<int> HDFDatabase::getIntegerArray(
hid_t dset, dspace;
hsize_t nsel;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1913,8 +1913,8 @@ bool HDFDatabase::isString(
if (!key.empty()) {
hid_t this_set;
BEGIN_SUPPRESS_HDF5_WARNINGS;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- this_set = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ this_set = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
this_set = H5Dopen(d_group_id, key.c_str());
#endif
@@ -1985,8 +1985,8 @@ void HDFDatabase::putStringArray(
hid_t space = H5Screate_simple(1, dim, NULL);
TBOX_ASSERT(space >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t dataset = H5Dcreate(d_group_id, key.c_str(),
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t dataset = H5Dcreate2(d_group_id, key.c_str(),
atype, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t dataset = H5Dcreate(d_group_id, key.c_str(),
@@ -2050,8 +2050,8 @@ Array<std::string> HDFDatabase::getStrin
hid_t dset, dspace, dtype;
char* local_buf;
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- dset = H5Dopen(d_group_id, key.c_str(), H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ dset = H5Dopen2(d_group_id, key.c_str(), H5P_DEFAULT);
#else
dset = H5Dopen(d_group_id, key.c_str());
#endif
@@ -2101,8 +2101,8 @@ void HDFDatabase::writeAttribute(
hid_t attr_id = H5Screate(H5S_SCALAR);
TBOX_ASSERT(attr_id >= 0);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t attr = H5Acreate(dataset_id, "Type", H5T_SAMRAI_ATTR,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t attr = H5Acreate2(dataset_id, "Type", H5T_SAMRAI_ATTR,
attr_id, H5P_DEFAULT, H5P_DEFAULT);
#else
hid_t attr = H5Acreate(dataset_id, "Type", H5T_SAMRAI_ATTR,
@@ -2342,8 +2342,8 @@ void HDFDatabase::insertArray(
#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 2))
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t array = H5Tarray_create(member_id, ndims, dim);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t array = H5Tarray_create2(member_id, ndims, dim);
#else
/*
* Note that perm is NOT used by HDF, see HDF documentation.
diff -r 045ab713ab35 -r 49006e096d2a source/test/restartdb/mainHDF5AppFileOpen.C
--- a/source/test/restartdb/mainHDF5AppFileOpen.C Sat Jan 01 22:25:03 2011 -0800
+++ b/source/test/restartdb/mainHDF5AppFileOpen.C Mon Jan 03 15:09:04 2011 -0800
@@ -94,8 +94,8 @@ int main(
mpi.getRank()) + ".hdf5";
hid_t file_id = H5Fcreate(name.c_str(), H5F_ACC_TRUNC,
H5P_DEFAULT, H5P_DEFAULT);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hid_t hdf_group = H5Gcreate(file_id,
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hid_t hdf_group = H5Gcreate2(file_id,
"SAMRAIGroup",
0,
H5P_DEFAULT,
@@ -122,8 +122,8 @@ int main(
database = new tbox::HDFDatabase("SAMRAI Restart");
file_id = H5Fopen(name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
-#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR < 6))
- hdf_group = H5Gopen(file_id, "SAMRAIGroup", H5P_DEFAULT);
+#if (H5_VERS_MAJOR > 1) || ((H5_VERS_MAJOR == 1) && (H5_VERS_MINOR > 6))
+ hdf_group = H5Gopen2(file_id, "SAMRAIGroup", H5P_DEFAULT);
#else
hdf_group = H5Gopen(file_id, "SAMRAIGroup");
#endif
More information about the CIG-COMMITS
mailing list