Changeset 1650

Timestamp:

03/13/08 14:52:36 (2 years ago)

Author:

kraftche

Message:

hdf5 1.8 API/ABI

Location:

MOAB/trunk

Files:

• ReadHDF5.cpp (modified) (1 diff)
• mhdf/src/adjacency.c (modified) (1 diff)
• mhdf/src/file.c (modified) (12 diffs)
• mhdf/src/sets.c (modified) (2 diffs)
• mhdf/src/tags.c (modified) (26 diffs)
• mhdf/src/util.c (modified) (11 diffs)

MOAB/trunk/ReadHDF5.cpp

@@ -1196 +1196 @@
   {
     hsize_t tmpsize = array_size;
+#if defined(H5Tarray_create_vers) && H5Tarray_create_vers > 1  
+    hdf_type = H5Tarray_create2( hdf_type, 1, &tmpsize );
+#else
     hdf_type = H5Tarray_create( hdf_type, 1, &tmpsize, NULL );
+#endif
     if (hdf_type < 0)
       return MB_FAILURE;

MOAB/trunk/mhdf/src/adjacency.c

@@ -38 +38 @@
   if (elem_group == mhdf_node_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen( file_ptr->hdf_handle, NODE_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, NODE_GROUP );
+#endif
     if (elem_id < 0)
     {

MOAB/trunk/mhdf/src/file.c

@@ -84 +84 @@
   
     /* Store the max ID as an attribite on the /tstt/ group */
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   rval = mhdf_create_scalar_attrib( group_id, 
                                     MAX_ID_ATTRIB, 
@@ -121 +125 @@
     }
   }
+#if defined(H5Tcommit_vers) && H5Tcommit_vers > 1
+  if (H5Tcommit2( file_ptr->hdf_handle, TYPE_ENUM_PATH, enum_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT ) < 0)  
+#else
   if (H5Tcommit( file_ptr->hdf_handle, TYPE_ENUM_PATH, enum_id ) < 0)  
+#endif
   {
     mhdf_setFail( status, "Failed to store elem type list." );
@@ -160 +168 @@
   hsize_t dims[2];
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  elem_id = H5Gopen2( group_id, subgroup, H5P_DEFAULT );
+#else
   elem_id = H5Gopen( group_id, subgroup );
+#endif
   if (elem_id < 0) return (herr_t)-1;
   
+#if defined(H5Dopen_vers) && H5Dopen_vers > 1  
+  conn_id = H5Dopen2( elem_id, datatable, H5P_DEFAULT );
+#else
   conn_id = H5Dopen( elem_id, datatable );
+#endif
   H5Gclose( elem_id );
   if (conn_id < 0) return (herr_t)-1;
@@ -203 +219 @@
   
     /* Check for new format, with max_id as attrib of root group */
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -288 +308 @@
   
     /* Check for TSTT data in file */
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -465 +489 @@
     return;
   }
-  
+
+#if defined(H5Gcreate_vers) && H5Gcreate_vers > 1
+  group_id = H5Gcreate2( file_ptr->hdf_handle, path, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   group_id = H5Gcreate( file_ptr->hdf_handle, path, 3 );
+#endif
   if (group_id < 0)
   {
@@ -475 +503 @@
   free( path );
   
+#if defined(H5Gcreate_vers) && H5Gcreate_vers > 1
+  tag_id = H5Gcreate2( group_id, DENSE_TAG_SUBGROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   tag_id = H5Gcreate( group_id, DENSE_TAG_SUBGROUP, 0 );
+#endif
   if (tag_id < 0)
   {
@@ -531 +563 @@
     return NULL;
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ELEMENT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ELEMENT_GROUP );
+#endif
   if (group_id < 0) 
   {
@@ -644 +680 @@
 make_hdf_group( const char* path, hid_t file, size_t size, mhdf_Status* status )
 {
+#if defined(H5Gcreate_vers) && H5Gcreate_vers > 1
+  hid_t handle = H5Gcreate2( file, path, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   hid_t handle = H5Gcreate( file, path, size );
+#endif
   if (handle < 0)
   {
@@ -727 +767 @@
   }
   
+#if defined(H5Dcreate_vers) && H5Dcreate_vers > 1
+  data_id = H5Dcreate2( file_ptr->hdf_handle, HISTORY_PATH, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   data_id = H5Dcreate( file_ptr->hdf_handle, HISTORY_PATH, type_id, space_id, H5P_DEFAULT );
+#endif
   H5Sclose( space_id );
   if (data_id < 0)
@@ -767 +811 @@
   
     /* check if file contains history data */
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -784 +832 @@
   }
   
+#if defined(H5Dopen_vers) && H5Dopen_vers > 1  
+  data_id = H5Dopen2( group_id, HISTORY_NAME, H5P_DEFAULT );
+#else
   data_id = H5Dopen( group_id, HISTORY_NAME );
+#endif
   H5Gclose( group_id );
   if (data_id < 0)

MOAB/trunk/mhdf/src/sets.c

@@ -39 +39 @@
   if (!mhdf_check_valid_file( file_ptr, status ))
     return -1;
-  
+
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  root_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   root_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   if (root_id < 0)
   {
@@ -54 +58 @@
   }
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  set_id = H5Gopen2( root_id, SET_GROUP_NAME, H5P_DEFAULT );
+#else
   set_id = H5Gopen( root_id, SET_GROUP_NAME );
+#endif
   H5Gclose( root_id );
   if (set_id < 0)

MOAB/trunk/mhdf/src/tags.c

@@ -118 +118 @@
     return -1;
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, TAG_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, TAG_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -126 +130 @@
   }
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  tag_id = H5Gopen2( group_id, path, H5P_DEFAULT );
+#else
   tag_id = H5Gopen( group_id, path );
+#endif
   H5Gclose( group_id );
   free( path );
@@ -146 +154 @@
   hid_t group_id, tag_id, type_id;
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, TAG_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, TAG_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -153 +165 @@
   }
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  tag_id = H5Gopen2( group_id, tag_path, H5P_DEFAULT );
+#else
   tag_id = H5Gopen( group_id, tag_path );
+#endif
   H5Gclose( group_id );
   if (tag_id < 0)
@@ -161 +177 @@
   }
   
+#if defined(H5Topen_vers) && H5Topen_vers > 1  
+  type_id = H5Topen2( tag_id, TAG_TYPE_NAME, H5P_DEFAULT );
+#else
   type_id = H5Topen( tag_id, TAG_TYPE_NAME );
+#endif
   H5Gclose( tag_id );
   if (type_id < 0)
@@ -192 +212 @@
   if (value_size == 1) 
     write_type = type_id;
-  else if (H5Tget_class(type_id) == H5T_OPAQUE) 
+  else if (H5Tget_class(type_id) == H5T_OPAQUE) {
     write_type = H5Tcreate( H5T_OPAQUE, abs(value_size) );
-  else
+  }
+  else {
+#if defined(H5Tarray_create_vers) && H5Tarray_create_vers > 1  
+    write_type = H5Tarray_create2( type_id, 1, &value_size );
+#else
     write_type = H5Tarray_create( type_id, 1, &value_size, 0 );
+#endif
+  }
   
   if (write_type < 0) {
@@ -246 +272 @@
     /* Open the tag group */
 
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, TAG_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, TAG_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -264 +294 @@
     /* Create group for this tag */
 
+#if defined(H5Gcreate_vers) && H5Gcreate_vers > 1
+  tag_id = H5Gcreate2( group_id, path, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   tag_id = H5Gcreate( group_id, path, 3 );
+#endif
   if (tag_id < 0)
   {
@@ -388 +422 @@
   else if (arr_len > 1)
   {
+#if defined(H5Tarray_create_vers) && H5Tarray_create_vers > 1  
+    temp_id = H5Tarray_create2( hdf_type, 1, &arr_len);
+#else
     temp_id = H5Tarray_create( hdf_type, 1, &arr_len, NULL );
+#endif
     H5Tclose( hdf_type );
     if (temp_id < 0)
@@ -404 +442 @@
     /* Create tag type object, or write attribute if opaque */
  
+#if defined(H5Tcommit_vers) && H5Tcommit_vers > 1
+  rval = H5Tcommit2( tag_id, TAG_TYPE_NAME, hdf_type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   rval = H5Tcommit( tag_id, TAG_TYPE_NAME, hdf_type );
+#endif
   if (rval < 0)
   {
@@ -531 +573 @@
     /* Open the tags group */
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, TAG_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, TAG_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -575 +621 @@
     /* Open the tags group */
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, TAG_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, TAG_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -657 +707 @@
       break;
     case H5T_ARRAY:
+#if defined(H5Tget_array_dims_vers) && H5Tget_array_dims_vers > 1
+      rank = H5Tget_array_dims2( type_id, dims );
+#else
       rank = H5Tget_array_dims( type_id, dims, perm );
+#endif
       if (rank == 1)
         break;
@@ -824 +878 @@
     
     /* Get tag type */
-  type_id = H5Topen( tag_id, TAG_TYPE_NAME );
+#if defined(H5Topen_vers) && H5Topen_vers > 1  
+  type_id = H5Topen2( tag_id, TAG_TYPE_NAME, H5P_DEFAULT );
+#else
+#endif
   if (type_id < 0)
   {
@@ -882 +939 @@
     case H5T_ARRAY:
       
+#if defined(H5Tget_array_dims_vers) && H5Tget_array_dims_vers > 1
+      rank = H5Tget_array_dims2( type_id, dims );
+#else
       rank = H5Tget_array_dims( type_id, dims, perm );
+#endif
       if (rank <= 0)
       {
@@ -977 +1038 @@
                       const char* attrib_name, 
                       hid_t type_id,
-                      const void* data, 
+                      void* data, 
                       int is_var_len, 
                       mhdf_Status* status )
@@ -1010 +1071 @@
     if (0 == type_id)
       read_type = H5Tcreate( H5T_OPAQUE, len );
-    else
+    else {
+#if defined(H5Tarray_create_vers) && H5Tarray_create_vers > 1  
+      read_type = H5Tarray_create2( type_id, 1, &len );
+#else
       read_type = H5Tarray_create( type_id, 1, &len, 0 );
+#endif
+    }
     if (read_type < 0)
     {
@@ -1101 +1167 @@
   if (type_handle == mhdf_node_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, NODE_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, NODE_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open node group." );
@@ -1107 +1177 @@
   else if (type_handle == mhdf_set_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, SET_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, SET_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open set group." );
@@ -1130 +1204 @@
   }
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( elem_id, DENSE_TAG_SUBGROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( elem_id, DENSE_TAG_SUBGROUP );
+#endif
   H5Gclose( elem_id );
   if (group_id < 0)
@@ -1173 +1251 @@
   if (type_handle == mhdf_node_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, NODE_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, NODE_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open node group." );
@@ -1179 +1261 @@
   else if (type_handle == mhdf_set_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, SET_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, SET_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open set group." );
@@ -1234 +1320 @@
   if (type_handle == mhdf_node_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, NODE_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, NODE_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open node group." );
@@ -1240 +1330 @@
   else if (type_handle == mhdf_set_type_handle())
   {
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+    elem_id = H5Gopen2( file_ptr->hdf_handle, SET_GROUP, H5P_DEFAULT );
+#else
     elem_id = H5Gopen( file_ptr->hdf_handle, SET_GROUP );
+#endif
     if (elem_id < 0)
       mhdf_setFail( status, "Could not open set group." );
@@ -1351 +1445 @@
   if (tag_id < 0) return ;
   
+#if defined(H5Topen_vers) && H5Topen_vers > 1  
+  type_id = H5Topen2( tag_id, TAG_TYPE_NAME, H5P_DEFAULT );
+#else
   type_id = H5Topen( tag_id, TAG_TYPE_NAME );
+#endif
   if (type_id < 0)
   {
@@ -1400 +1498 @@
   if (tag_id < 0) return ;
   
+#if defined(H5Topen_vers) && H5Topen_vers > 1  
+  type_id = H5Topen2( tag_id, TAG_TYPE_NAME, H5P_DEFAULT );
+#else
   type_id = H5Topen( tag_id, TAG_TYPE_NAME );
+#endif
   if (type_id < 0)
   {

MOAB/trunk/mhdf/src/util.c

@@ -147 +147 @@
     return -1;
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  result = H5Gopen2( file_ptr->hdf_handle, path, H5P_DEFAULT );
+#else
   result = H5Gopen( file_ptr->hdf_handle, path );
+#endif
   free( path );
   if (result < 0)
@@ -170 +174 @@
   }
  
+#if defined(H5Acreate_vers) && H5Acreate_vers > 1
+  attr_id = H5Acreate2( object, name, type, dspace_id, H5P_DEFAULT, H5P_DEFAULT );
+#else
   attr_id = H5Acreate( object, name, type, dspace_id, H5P_DEFAULT );
+#endif
   H5Sclose( dspace_id );
   if (attr_id < 0)
@@ -233 +241 @@
 }
 
+#if defined(H5Aiterate_vers) && H5Aiterate_vers > 1
+static herr_t find_attr_by_name( hid_t handle, const char* name, const H5A_info_t* info, void* mydata )
+#else
 static herr_t find_attr_by_name( hid_t handle, const char* name, void* mydata )
+#endif
   { return !strcmp( name, (const char*)mydata ); } 
 
@@ -242 +254 @@
 {
   herr_t rval;
+#if defined(H5Aiterate_vers) && H5Aiterate_vers > 1
+  hsize_t idx = 0;
+  rval = H5Aiterate2( object, H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, &idx, &find_attr_by_name, (void*)attrib_name );
+  *index_out = (unsigned int)idx;
+#else
   *index_out = 0;
   rval = H5Aiterate( object, index_out, &find_attr_by_name, (void*)attrib_name );
+#endif
   if (rval < 0)
     mhdf_setFail( status, "Internal error calling H5Aiterate." );
@@ -511 +529 @@
   }
   
+#if defined(H5Dcreate_vers) && H5Dcreate_vers > 1
+  table_id = H5Dcreate2( group_id, path, type, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT );
+#else
   table_id = H5Dcreate( group_id, path, type, space_id, H5P_DEFAULT );
+#endif
   H5Sclose(space_id);
   if (table_id < 0)
@@ -535 +557 @@
   int rank;
   
+#if defined(H5Dopen_vers) && H5Dopen_vers > 1  
+  table_id = H5Dopen2( group_id, path, H5P_DEFAULT );
+#else
   table_id = H5Dopen( group_id, path );
+#endif
   if (table_id < 0)
   {
@@ -583 +609 @@
   hid_t table_id, space_id;
   
+#if defined(H5Dopen_vers) && H5Dopen_vers > 1  
+  table_id = H5Dopen2( group_id, path, H5P_DEFAULT );
+#else
   table_id = H5Dopen( group_id, path );
+#endif
   if (table_id < 0)
   {
@@ -692 +722 @@
 {
   hid_t result;
+#if defined(H5Topen_vers) && H5Topen_vers > 1  
+  result = H5Topen2( file_ptr->hdf_handle, TYPE_ENUM_PATH, H5P_DEFAULT );
+#else
   result = H5Topen( file_ptr->hdf_handle, TYPE_ENUM_PATH );
+#endif
   if (result < 0)
     mhdf_setFail( status, "Element type enum does not exist in file.  Invalid file." );
@@ -704 +738 @@
   herr_t rval;
   
+#if defined(H5Gopen_vers) && H5Gopen_vers > 1  
+  group_id = H5Gopen2( file_ptr->hdf_handle, ROOT_GROUP, H5P_DEFAULT );
+#else
   group_id = H5Gopen( file_ptr->hdf_handle, ROOT_GROUP );
+#endif
   if (group_id < 0)
   {
@@ -715 +753 @@
   {
     space_id = H5Screate( H5S_SCALAR );
+#if defined(H5Acreate_vers) && H5Acreate_vers > 1
+    attr_id = H5Acreate2( group_id, 
+                          MAX_ID_ATTRIB, 
+                          H5T_NATIVE_ULONG,
+                          space_id, 
+                          H5P_DEFAULT,
+                          H5P_DEFAULT );
+#else
     attr_id = H5Acreate( group_id, 
                          MAX_ID_ATTRIB, 
@@ -720 +766 @@
                          space_id, 
                          H5P_DEFAULT );
+#endif
     H5Sclose( space_id );
   }