[MOAB-dev] r2001 - in MOAB/trunk/mhdf: include src
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Wed Jul 9 11:05:39 CDT 2008
Author: kraftche
Date: 2008-07-09 11:05:39 -0500 (Wed, 09 Jul 2008)
New Revision: 2001
Modified:
MOAB/trunk/mhdf/include/mhdf.h
MOAB/trunk/mhdf/src/adjacency.c
MOAB/trunk/mhdf/src/connectivity.c
MOAB/trunk/mhdf/src/file-handle.h
MOAB/trunk/mhdf/src/file.c
MOAB/trunk/mhdf/src/nodes.c
MOAB/trunk/mhdf/src/sets.c
MOAB/trunk/mhdf/src/tags.c
MOAB/trunk/mhdf/src/util.c
MOAB/trunk/mhdf/src/util.h
Log:
o Back out changes that called H5Pset_dxpl_mpio on HDF5 group handles
o For every function of the form mhdf_read* and mhdf_write*, add a new
function mhdf_read*WithOpt or mhdf_write*WithOpt that accepts an
HDF5 property handle to pass to H5Dread or H5Dwrite.
Modified: MOAB/trunk/mhdf/include/mhdf.h
===================================================================
--- MOAB/trunk/mhdf/include/mhdf.h 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/include/mhdf.h 2008-07-09 16:05:39 UTC (rev 2001)
@@ -343,6 +343,13 @@
long count,
const double* coords,
mhdf_Status* status );
+void
+mhdf_writeNodeCoordsWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ const double* coords,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Write node coordinate data
*
@@ -364,6 +371,14 @@
int dimension,
const double* coords,
mhdf_Status* status );
+void
+mhdf_writeNodeCoordWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ int dimension,
+ const double* coords,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read node coordinate data
*
@@ -382,6 +397,13 @@
long count,
double* coordinates,
mhdf_Status* status );
+void
+mhdf_readNodeCoordsWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ double* coordinates,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read node coordinate data
@@ -404,6 +426,14 @@
int dimension,
double* coords,
mhdf_Status* status );
+void
+mhdf_readNodeCoordWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ int dimension,
+ double* coords,
+ hid_t read_prop,
+ mhdf_Status* status );
/*@}*/
/**
@@ -588,6 +618,14 @@
hid_t hdf_integer_type,
const void* node_id_list,
mhdf_Status* status );
+void
+mhdf_writeConnectivityWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* node_id_list,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read element coordinate data
*
@@ -613,6 +651,14 @@
hid_t hdf_integer_type,
void* node_id_list,
mhdf_Status* status );
+void
+mhdf_readConnectivityWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* node_id_list,
+ hid_t read_prop,
+ mhdf_Status* status );
/* Poly(gon|hedra) */
@@ -731,6 +777,14 @@
hid_t hdf_integer_type,
const void* index_list,
mhdf_Status* status );
+void
+mhdf_writePolyConnIndicesWithOpt( hid_t poly_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* index_list,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Write polygon or polyhedron connectivity data.
*
@@ -767,6 +821,14 @@
hid_t hdf_integer_type,
const void* id_list,
mhdf_Status* status );
+void
+mhdf_writePolyConnIDsWithOpt( hid_t poly_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* id_list,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read polygon or polyhedron index data.
*
@@ -800,6 +862,14 @@
hid_t hdf_integer_type,
void* index_list,
mhdf_Status* status );
+void
+mhdf_readPolyConnIndicesWithOpt( hid_t poly_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* index_list,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read polygon or polyhedron connectivity data.
*
@@ -833,6 +903,14 @@
hid_t hdf_integer_type,
void* id_list,
mhdf_Status* status );
+void
+mhdf_readPolyConnIDsWithOpt( hid_t poly_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* id_list,
+ hid_t read_prop,
+ mhdf_Status* status );
/*@}*/
/**
*\defgroup mhdf_adj Adjacency data.
@@ -941,6 +1019,14 @@
hid_t hdf_integer_type,
const void* adj_list_data,
mhdf_Status* status );
+void
+mhdf_writeAdjacencyWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* adj_list_data,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read node/element adjacency data
*
@@ -973,6 +1059,14 @@
hid_t hdf_integer_type,
void* adj_list_data_out,
mhdf_Status* status );
+void
+mhdf_readAdjacencyWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* adj_list_data_out,
+ hid_t read_prop,
+ mhdf_Status* status );
/*@}*/
@@ -1131,6 +1225,14 @@
hid_t hdf_integer_type,
void* set_desc_data,
mhdf_Status* status );
+void
+mhdf_readSetMetaWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* set_desc_data,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read only the flags portion of the set description table
*
@@ -1150,6 +1252,14 @@
hid_t hdf_integer_type,
void* set_flag_data,
mhdf_Status* status );
+void
+mhdf_readSetFlagsWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* set_flag_data,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read only the content end indices portion of the set description table
@@ -1174,6 +1284,14 @@
hid_t hdf_integer_type,
void* end_indices_out,
mhdf_Status* status );
+void
+mhdf_readSetContentEndIndicesWithProp( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* end_indices_out,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read only the child end indices portion of the set description table
*
@@ -1197,6 +1315,14 @@
hid_t hdf_integer_type,
void* end_indices_out,
mhdf_Status* status );
+void
+mhdf_readSetChildEndIndicesWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* end_indices_out,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read only the parent end indices portion of the set description table
*
@@ -1220,6 +1346,14 @@
hid_t hdf_integer_type,
void* end_indices_out,
mhdf_Status* status );
+void
+mhdf_readSetParentEndIndicesWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* end_indices_out,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Write list of sets and meta-information about sets.
@@ -1245,6 +1379,14 @@
hid_t hdf_integer_type,
const void* set_desc_data,
mhdf_Status* status );
+void
+mhdf_writeSetMetaWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* set_desc_data,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Create file object to hold list of meshset contents.
*
@@ -1312,6 +1454,14 @@
hid_t hdf_integer_type,
const void* set_data,
mhdf_Status* status );
+void
+mhdf_writeSetDataWithOpt( hid_t set_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* set_data,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read set contents.
*
@@ -1340,6 +1490,14 @@
hid_t hdf_integer_type,
void* set_data,
mhdf_Status* status );
+void
+mhdf_readSetDataWithOpt( hid_t set_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* set_data,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Create file object for storing the set child list
*
@@ -1437,6 +1595,14 @@
hid_t hdf_integer_type,
const void* id_list,
mhdf_Status* status );
+void
+mhdf_writeSetParentsChildrenWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* id_list,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read set parent/child list
*
@@ -1462,6 +1628,14 @@
hid_t hdf_integer_type,
void* id_list,
mhdf_Status* status );
+void
+mhdf_readSetParentsChildrenWithOpt( hid_t data_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* id_list,
+ hid_t read_prop,
+ mhdf_Status* status );
/*@}*/
@@ -1764,6 +1938,14 @@
hid_t hdf_data_type,
const void* tag_data,
mhdf_Status* status );
+void
+mhdf_writeDenseTagWithOpt( hid_t tag_handle,
+ long offset,
+ long count,
+ hid_t hdf_data_type,
+ const void* tag_data,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read dense tag values
*
@@ -1787,6 +1969,14 @@
hid_t hdf_data_type,
void* tag_data,
mhdf_Status* status );
+void
+mhdf_readDenseTagWithOpt( hid_t tag_handle,
+ long offset,
+ long count,
+ hid_t hdf_data_type,
+ void* tag_data,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Create file objects to store sparse tag data
*
@@ -1890,6 +2080,14 @@
hid_t hdf_integer_type,
const void* id_list,
mhdf_Status* status );
+void
+mhdf_writeSparseTagEntitiesWithOpt( hid_t id_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* id_list,
+ hid_t write_prop,
+ mhdf_Status* status );
@@ -1915,6 +2113,14 @@
hid_t hdf_tag_data_type,
const void* tag_data,
mhdf_Status* status );
+void
+mhdf_writeSparseTagValuesWithOpt( hid_t value_handle,
+ long offset,
+ long count,
+ hid_t hdf_tag_data_type,
+ const void* tag_data,
+ hid_t write_prop,
+ mhdf_Status* status );
/**\brief Write sparse tag end indices for variable-length tag data
*
@@ -1937,6 +2143,14 @@
hid_t hdf_integer_type,
const void* end_indices,
mhdf_Status* status );
+void
+mhdf_writeSparseTagIndicesWithOpt( hid_t tag_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* end_indices,
+ hid_t write_prop,
+ mhdf_Status* status );
/** \brief Read Global ID list for sparse tag data
*
@@ -1959,6 +2173,14 @@
hid_t hdf_integer_type,
void* id_list,
mhdf_Status* status );
+void
+mhdf_readSparseTagEntitiesWithOpt( hid_t id_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* id_list,
+ hid_t read_prop,
+ mhdf_Status* status );
/** \brief Read tag value list for sparse tag data
*
@@ -1981,6 +2203,14 @@
hid_t hdf_type,
void* memory,
mhdf_Status* status );
+void
+mhdf_readSparseTagValuesWithOpt( hid_t value_handle,
+ long offset,
+ long count,
+ hid_t hdf_type,
+ void* memory,
+ hid_t read_prop,
+ mhdf_Status* status );
/**\brief Read sparse tag end indices for variable-length tag data
@@ -2004,6 +2234,14 @@
hid_t hdf_integer_type,
void* end_indices,
mhdf_Status* status );
+void
+mhdf_readSparseTagIndicesWithOpt( hid_t tag_handle,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* end_indices,
+ hid_t read_prop,
+ mhdf_Status* status );
/*@}*/
Modified: MOAB/trunk/mhdf/src/adjacency.c
===================================================================
--- MOAB/trunk/mhdf/src/adjacency.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/adjacency.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -137,7 +137,7 @@
{
table_id = mhdf_open_table( file_ptr->hdf_handle,
NODE_ADJCY_PATH,
- 1, file_ptr->parallel, &dim,
+ 1, &dim,
status );
}
else
@@ -146,7 +146,7 @@
if (elem_id < 0) return -1;
table_id = mhdf_open_table( elem_id,
ADJACENCY_NAME,
- 1, file_ptr->parallel, &dim,
+ 1, &dim,
status );
H5Gclose( elem_id );
}
@@ -165,11 +165,25 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, type, data, status );
+ mhdf_write_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
void
+mhdf_writeAdjacencyWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ const void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
+
+void
mhdf_readAdjacency( hid_t table_id,
long offset,
long count,
@@ -178,9 +192,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, type, data, status );
+ mhdf_read_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readAdjacencyWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
Modified: MOAB/trunk/mhdf/src/connectivity.c
===================================================================
--- MOAB/trunk/mhdf/src/connectivity.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/connectivity.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -113,7 +113,7 @@
if (elem_id < 0) return -1;
table_id = mhdf_open_table2( elem_id, CONNECTIVITY_NAME,
- 2, file_ptr->parallel, dims,
+ 2, dims,
first_elem_id_out, status );
H5Gclose( elem_id );
@@ -138,9 +138,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, hdf_integer_type, nodes, status );
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, nodes, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeConnectivityWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* nodes,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, nodes, prop, status );
+ API_END;
+}
void
mhdf_readConnectivity( hid_t table_id,
@@ -151,9 +164,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, hdf_integer_type, nodes, status );
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, nodes, H5P_DEFAULT,status );
API_END;
}
+void
+mhdf_readConnectivityWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* nodes,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, nodes, prop, status );
+ API_END;
+}
void
@@ -276,13 +302,13 @@
if (elem_id < 0) return ;
index_id = mhdf_open_table( elem_id, POLY_INDEX_NAME,
- 1, file_ptr->parallel, &row_count, status );
+ 1, &row_count, status );
if (index_id < 0)
{ H5Gclose(elem_id); return ; }
*num_poly_out = (int)row_count;
table_id = mhdf_open_table( elem_id, CONNECTIVITY_NAME,
- 1, file_ptr->parallel, &row_count, status );
+ 1, &row_count, status );
H5Gclose( elem_id );
if (table_id < 0)
@@ -316,9 +342,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, hdf_integer_type, index_list, status );
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, index_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writePolyConnIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* index_list,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, index_list, prop, status );
+ API_END;
+}
void
mhdf_readPolyConnIndices( hid_t table_id,
@@ -329,9 +368,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, hdf_integer_type, index_list, status );
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, index_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readPolyConnIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* index_list,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, index_list, prop, status );
+ API_END;
+}
void
mhdf_writePolyConnIDs( hid_t table_id,
@@ -342,9 +394,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, hdf_integer_type, id_list, status );
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, id_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writePolyConnIDsWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ const void* id_list,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, hdf_integer_type, id_list, prop, status );
+ API_END;
+}
void
mhdf_readPolyConnIDs( hid_t table_id,
@@ -355,7 +420,20 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, hdf_integer_type, id_list, status );
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, id_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readPolyConnIDsWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t hdf_integer_type,
+ void* id_list,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, hdf_integer_type, id_list, prop, status );
+ API_END;
+}
Modified: MOAB/trunk/mhdf/src/file-handle.h
===================================================================
--- MOAB/trunk/mhdf/src/file-handle.h 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/file-handle.h 2008-07-09 16:05:39 UTC (rev 2001)
@@ -32,7 +32,6 @@
int open_handle_count;
long max_id;
- int parallel;
} FileHandle;
FileHandle* mhdf_alloc_FileHandle( hid_t hdf_handle, mhdf_Status* status );
Modified: MOAB/trunk/mhdf/src/file.c
===================================================================
--- MOAB/trunk/mhdf/src/file.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/file.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -22,10 +22,6 @@
#include <H5Spublic.h>
#include <H5Tpublic.h>
#include <H5Apublic.h>
-#ifdef USE_MPI
-#include <H5FDmpi.h>
-#include <H5FDmpio.h>
-#endif
#include "mhdf.h"
#include "status.h"
#include "names-and-paths.h"
@@ -335,17 +331,7 @@
if (max_id_out)
*max_id_out = file_ptr->max_id;
-
- file_ptr->parallel = 0;
-
-#ifdef USE_MPI
- MPI_Comm comm;
- MPI_Info info;
- if (0 <= H5Pget_fapl_mpio(access_prop, &comm, &info) &&
- MPI_COMM_NULL != comm && MPI_INFO_NULL != info)
- file_ptr->parallel = 1;
-#endif
-
+
mhdf_setOkay( status );
API_END_H(1);
return file_ptr;
Modified: MOAB/trunk/mhdf/src/nodes.c
===================================================================
--- MOAB/trunk/mhdf/src/nodes.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/nodes.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -15,6 +15,7 @@
#include <H5Tpublic.h>
#include <H5Dpublic.h>
+#include <H5Ppublic.h>
#include "mhdf.h"
#include "status.h"
#include "names-and-paths.h"
@@ -95,7 +96,7 @@
return -1;
table_id = mhdf_open_table2( file_ptr->hdf_handle,
- NODE_COORD_PATH, 2, file_ptr->parallel,
+ NODE_COORD_PATH, 2,
dims, first_id_out, status );
if (table_id < 0)
return -1;
@@ -117,9 +118,21 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, status );
+ mhdf_write_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeNodeCoordsWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ const double* coords,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, prop, status );
+ API_END;
+}
void
mhdf_readNodeCoords( hid_t table_id,
@@ -129,9 +142,21 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, status );
+ mhdf_read_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readNodeCoordsWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ double* coords,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, H5T_NATIVE_DOUBLE, coords, prop, status );
+ API_END;
+}
void
mhdf_writeNodeCoord( hid_t table_id,
@@ -143,9 +168,23 @@
{
API_BEGIN;
mhdf_write_column( table_id, dimension, offset, count,
- H5T_NATIVE_DOUBLE, coords, status );
+ H5T_NATIVE_DOUBLE, coords, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeNodeCoordWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ int dimension,
+ const double* coords,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_column( table_id, dimension, offset, count,
+ H5T_NATIVE_DOUBLE, coords, prop, status );
+ API_END;
+}
void
@@ -158,7 +197,21 @@
{
API_BEGIN;
mhdf_read_column( table_id, dimension, offset, count,
- H5T_NATIVE_DOUBLE, coords, status );
+ H5T_NATIVE_DOUBLE, coords, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readNodeCoordWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ int dimension,
+ double* coords,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_column( table_id, dimension, offset, count,
+ H5T_NATIVE_DOUBLE, coords, prop, status );
+ API_END;
+}
Modified: MOAB/trunk/mhdf/src/sets.c
===================================================================
--- MOAB/trunk/mhdf/src/sets.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/sets.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -179,7 +179,7 @@
return -1;
table_id = mhdf_open_table2( file_ptr->hdf_handle,
- SET_META_PATH, 2, file_ptr->parallel,
+ SET_META_PATH, 2,
dims, first_id_out, status );
if (table_id < 0)
return -1;
@@ -207,6 +207,7 @@
mhdf_readwriteSetMeta( hid_t table_id, int read,
long offset, long count,
hid_t type, void* data,
+ hid_t prop,
mhdf_Status* status )
{
hid_t slab_id, sslab_id, smem_id, mem_id;
@@ -279,9 +280,9 @@
}
if (read)
- rval = H5Dread( table_id, type, mem_id, slab_id, H5P_DEFAULT, data );
+ rval = H5Dread( table_id, type, mem_id, slab_id, prop, data );
else
- rval = H5Dwrite( table_id, type, mem_id, slab_id, H5P_DEFAULT, data );
+ rval = H5Dwrite( table_id, type, mem_id, slab_id, prop, data );
}
/* Old table: 3 columns, no parent link counts */
else if (counts[1] == 3)
@@ -322,9 +323,9 @@
}
if (read)
- rval = H5Dread( table_id, type, smem_id, sslab_id, H5P_DEFAULT, data );
+ rval = H5Dread( table_id, type, smem_id, sslab_id, prop, data );
else
- rval = H5Dwrite( table_id, type, smem_id, sslab_id, H5P_DEFAULT, data );
+ rval = H5Dwrite( table_id, type, smem_id, sslab_id, prop, data );
H5Sclose( sslab_id );
H5Sclose( smem_id );
@@ -367,9 +368,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readwriteSetMeta( table_id, 1, offset, count, type, data, status );
+ mhdf_readwriteSetMeta( table_id, 1, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetMetaWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readwriteSetMeta( table_id, 1, offset, count, type, data, prop, status );
+ API_END;
+}
void
mhdf_writeSetMeta( hid_t table_id,
@@ -380,9 +394,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readwriteSetMeta( table_id, 0, offset, count, type, (void*)data, status );
+ mhdf_readwriteSetMeta( table_id, 0, offset, count, type, (void*)data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeSetMetaWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ const void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readwriteSetMeta( table_id, 0, offset, count, type, (void*)data, prop, status );
+ API_END;
+}
enum SetMetaCol {
@@ -397,6 +424,7 @@
enum SetMetaCol column,
long offset, long count,
hid_t type, void* data,
+ hid_t prop,
mhdf_Status* status )
{
hid_t slab_id, mem_id;
@@ -499,7 +527,7 @@
/* Read the data */
- rval = H5Dread( table_id, type, mem_id, slab_id, H5P_DEFAULT, data );
+ rval = H5Dread( table_id, type, mem_id, slab_id, prop, data );
H5Sclose( mem_id );
H5Sclose( slab_id );
if (rval < 0)
@@ -522,9 +550,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readSetMetaColumn( table_id, FLAGS, offset, count, type, data, status );
+ mhdf_readSetMetaColumn( table_id, FLAGS, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetFlagsWihtOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readSetMetaColumn( table_id, FLAGS, offset, count, type, data, prop, status );
+ API_END;
+}
void
@@ -536,9 +577,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readSetMetaColumn( table_id, CONTENT, offset, count, type, data, status );
+ mhdf_readSetMetaColumn( table_id, CONTENT, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetContentEndIndicesWithProp( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readSetMetaColumn( table_id, CONTENT, offset, count, type, data, prop, status );
+ API_END;
+}
void
mhdf_readSetChildEndIndices( hid_t table_id,
@@ -549,9 +603,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readSetMetaColumn( table_id, CHILDREN, offset, count, type, data, status );
+ mhdf_readSetMetaColumn( table_id, CHILDREN, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetChildEndIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readSetMetaColumn( table_id, CHILDREN, offset, count, type, data, prop, status );
+ API_END;
+}
void
mhdf_readSetParentEndIndices( hid_t table_id,
@@ -562,9 +629,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_readSetMetaColumn( table_id, PARENTS, offset, count, type, data, status );
+ mhdf_readSetMetaColumn( table_id, PARENTS, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetParentEndIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_readSetMetaColumn( table_id, PARENTS, offset, count, type, data, prop, status );
+ API_END;
+}
hid_t
mhdf_createSetData( mhdf_FileHandle file_handle,
@@ -618,7 +698,7 @@
table_id = mhdf_open_table( file_ptr->hdf_handle,
SET_DATA_PATH,
- 1, file_ptr->parallel, &dim,
+ 1, &dim,
status );
*data_list_size_out = (long)dim;
@@ -636,9 +716,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, type, data, status );
+ mhdf_write_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeSetDataWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ const void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
void
@@ -650,9 +743,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, type, data, status );
+ mhdf_read_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetDataWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
hid_t
mhdf_createSetChildren( mhdf_FileHandle file_handle,
@@ -706,7 +812,7 @@
table_id = mhdf_open_table( file_ptr->hdf_handle,
SET_CHILD_PATH,
- 1, file_ptr->parallel, &dim,
+ 1, &dim,
status );
*child_list_size = (long)dim;
@@ -766,7 +872,7 @@
table_id = mhdf_open_table( file_ptr->hdf_handle,
SET_PARENT_PATH,
- 1, file_ptr->parallel, &dim,
+ 1, &dim,
status );
*parent_list_size = (long)dim;
@@ -783,9 +889,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, type, data, status );
+ mhdf_write_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeSetParentsChildrenWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ const void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
void
mhdf_readSetParentsChildren( hid_t table_id,
@@ -796,6 +915,19 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, type, data, status );
+ mhdf_read_data( table_id, offset, count, type, data, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSetParentsChildrenWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t type,
+ void* data,
+ hid_t prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, type, data, prop, status );
+ API_END;
+}
Modified: MOAB/trunk/mhdf/src/tags.c
===================================================================
--- MOAB/trunk/mhdf/src/tags.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/tags.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -1400,7 +1400,7 @@
strcpy( path, DENSE_TAG_SUBGROUP );
mhdf_name_to_path( tag_name, path + dir_len, name_len + 1 );
- data_id = mhdf_open_table( elem_id, path, 1, file_ptr->parallel, &size, status );
+ data_id = mhdf_open_table( elem_id, path, 1, &size, status );
free( path );
H5Gclose( elem_id );
*num_values_out = (long)size;
@@ -1421,6 +1421,18 @@
const void* tag_data,
mhdf_Status* status )
{
+ mhdf_writeDenseTagWithOpt( tag_table, offset, count, type_id, tag_data,
+ H5P_DEFAULT,status );
+}
+void
+mhdf_writeDenseTagWithOpt( hid_t tag_table,
+ long offset,
+ long count,
+ hid_t type_id,
+ const void* tag_data,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
hid_t my_type_id;
API_BEGIN;
@@ -1438,7 +1450,7 @@
}
}
- mhdf_write_data( tag_table, offset, count, my_type_id, tag_data, status );
+ mhdf_write_data( tag_table, offset, count, my_type_id, tag_data, io_prop, status );
if (type_id < 1)
H5Tclose( my_type_id );
@@ -1454,6 +1466,19 @@
mhdf_Status* status )
{
+ mhdf_readDenseTagWithOpt( tag_table,offset, count, type_id, tag_data,
+ H5P_DEFAULT, status );
+}
+void
+mhdf_readDenseTagWithOpt( hid_t tag_table,
+ long offset,
+ long count,
+ hid_t type_id,
+ void* tag_data,
+ hid_t io_prop,
+ mhdf_Status* status )
+
+{
hid_t my_type_id;
API_BEGIN;
@@ -1471,7 +1496,7 @@
}
}
- mhdf_read_data( tag_table, offset, count, my_type_id, tag_data, status );
+ mhdf_read_data( tag_table, offset, count, my_type_id, tag_data, io_prop, status );
if (type_id < 1)
H5Tclose( my_type_id );
@@ -1615,15 +1640,14 @@
tag_id = get_tag( file_handle, tag_name, status );
if (tag_id < 0) return ;
- FileHandle *file_ptr = (FileHandle*)file_handle;
- index_id = mhdf_open_table( tag_id, SPARSE_ENTITY_NAME, 1, file_ptr->parallel, &num_ent, status );
+ index_id = mhdf_open_table( tag_id, SPARSE_ENTITY_NAME, 1, &num_ent, status );
if (index_id < 0)
{
H5Gclose( tag_id );
return ;
}
- data_id = mhdf_open_table( tag_id, SPARSE_VALUES_NAME, 1, file_ptr->parallel, &data_size, status );
+ data_id = mhdf_open_table( tag_id, SPARSE_VALUES_NAME, 1, &data_size, status );
if (data_id < 0)
{
H5Gclose( tag_id );
@@ -1642,7 +1666,7 @@
/* If variable length... */
if (rval) {
- offset_id = mhdf_open_table( tag_id, TAG_VAR_INDICES, 1, file_ptr->parallel, &num_data, status );
+ offset_id = mhdf_open_table( tag_id, TAG_VAR_INDICES, 1, &num_data, status );
if (offset_id < 0) {
H5Gclose( tag_id );
H5Dclose( index_id );
@@ -1686,9 +1710,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, int_type, id_list, status );
+ mhdf_write_data( table_id, offset, count, int_type, id_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeSparseTagEntitiesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t int_type,
+ const void* id_list,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, int_type, id_list, io_prop, status );
+ API_END;
+}
void
mhdf_writeSparseTagValues( hid_t table_id,
@@ -1698,6 +1735,19 @@
const void* tag_data,
mhdf_Status* status )
{
+ mhdf_writeSparseTagValuesWithOpt( table_id, offset, count, tag_type, tag_data,
+ H5P_DEFAULT, status );
+}
+
+void
+mhdf_writeSparseTagValuesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t tag_type,
+ const void* tag_data,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
hid_t type_id;
API_BEGIN;
@@ -1715,7 +1765,7 @@
}
}
- mhdf_write_data( table_id, offset, count, type_id, tag_data, status );
+ mhdf_write_data( table_id, offset, count, type_id, tag_data, io_prop, status );
if (tag_type < 1)
H5Tclose( type_id );
@@ -1731,9 +1781,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_write_data( table_id, offset, count, int_type, indices, status );
+ mhdf_write_data( table_id, offset, count, int_type, indices, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_writeSparseTagIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t int_type,
+ const void* indices,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_write_data( table_id, offset, count, int_type, indices, io_prop, status );
+ API_END;
+}
void
mhdf_readSparseTagEntities( hid_t table_id,
@@ -1744,9 +1807,22 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, int_type, id_list, status );
+ mhdf_read_data( table_id, offset, count, int_type, id_list, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSparseTagEntitiesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t int_type,
+ void* id_list,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, int_type, id_list, io_prop, status );
+ API_END;
+}
void
mhdf_readSparseTagValues( hid_t table_id,
@@ -1756,6 +1832,18 @@
void* tag_data,
mhdf_Status* status )
{
+ mhdf_readSparseTagValuesWithOpt( table_id, offset, count, tag_type, tag_data,
+ H5P_DEFAULT, status );
+}
+void
+mhdf_readSparseTagValuesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t tag_type,
+ void* tag_data,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
hid_t type_id;
API_BEGIN;
@@ -1773,7 +1861,7 @@
}
}
- mhdf_read_data( table_id, offset, count, type_id, tag_data, status );
+ mhdf_read_data( table_id, offset, count, type_id, tag_data, io_prop, status );
if (tag_type < 1)
H5Tclose( type_id );
@@ -1789,6 +1877,19 @@
mhdf_Status* status )
{
API_BEGIN;
- mhdf_read_data( table_id, offset, count, int_type, indices, status );
+ mhdf_read_data( table_id, offset, count, int_type, indices, H5P_DEFAULT, status );
API_END;
}
+void
+mhdf_readSparseTagIndicesWithOpt( hid_t table_id,
+ long offset,
+ long count,
+ hid_t int_type,
+ void* indices,
+ hid_t io_prop,
+ mhdf_Status* status )
+{
+ API_BEGIN;
+ mhdf_read_data( table_id, offset, count, int_type, indices, io_prop, status );
+ API_END;
+}
Modified: MOAB/trunk/mhdf/src/util.c
===================================================================
--- MOAB/trunk/mhdf/src/util.c 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/util.c 2008-07-09 16:05:39 UTC (rev 2001)
@@ -21,10 +21,6 @@
#include "util.h"
#include "status.h"
#include "names-and-paths.h"
-#ifdef USE_MPI
-#include <H5FDmpi.h>
-#include <H5FDmpio.h>
-#endif
void* mhdf_malloc( size_t size, mhdf_Status* status )
{
@@ -287,6 +283,7 @@
mhdf_readwrite( hid_t data_id, int read,
long offset, long count,
hid_t type, void* array,
+ hid_t io_prop,
mhdf_Status* status )
{
hid_t slab_id, mem_id;
@@ -357,9 +354,9 @@
if (read)
- rval = H5Dread( data_id, type, mem_id, slab_id, H5P_DEFAULT, array );
+ rval = H5Dread( data_id, type, mem_id, slab_id, io_prop, array );
else
- rval = H5Dwrite( data_id, type, mem_id, slab_id, H5P_DEFAULT, array );
+ rval = H5Dwrite( data_id, type, mem_id, slab_id, io_prop, array );
H5Sclose( slab_id );
H5Sclose( mem_id );
if (rval < 0)
@@ -378,6 +375,7 @@
int column,
long offset, long count,
hid_t type, void* array,
+ hid_t io_prop,
mhdf_Status* status )
{
hid_t slab_id, mem_id;
@@ -450,9 +448,9 @@
if (read)
- rval = H5Dread( data_id, type, mem_id, slab_id, H5P_DEFAULT, array );
+ rval = H5Dread( data_id, type, mem_id, slab_id, io_prop, array );
else
- rval = H5Dwrite( data_id, type, mem_id, slab_id, H5P_DEFAULT, array );
+ rval = H5Dwrite( data_id, type, mem_id, slab_id, io_prop, array );
H5Sclose( slab_id );
H5Sclose( mem_id );
if (rval < 0)
@@ -472,9 +470,10 @@
long count,
hid_t type_id,
const void* array,
+ hid_t prop,
mhdf_Status* status )
{
- return mhdf_readwrite( data_id, 0, offset, count, type_id, (void*)array, status );
+ return mhdf_readwrite( data_id, 0, offset, count, type_id, (void*)array, prop, status );
}
int
@@ -483,9 +482,10 @@
long count,
hid_t type_id,
void* array,
+ hid_t prop,
mhdf_Status* status )
{
- return mhdf_readwrite( data_id, 1, offset, count, type_id, array, status );
+ return mhdf_readwrite( data_id, 1, offset, count, type_id, array, prop, status );
}
int
@@ -495,10 +495,11 @@
long count,
hid_t type,
void* array,
+ hid_t prop,
mhdf_Status* status )
{
return mhdf_readwrite_column( data_id, 1, column, offset, count,
- type, array, status );
+ type, array, prop, status );
}
int
@@ -508,10 +509,11 @@
long count,
hid_t type,
const void* array,
+ hid_t prop,
mhdf_Status* status )
{
return mhdf_readwrite_column( data_id, 0, column, offset, count,
- type, (void*)array, status );
+ type, (void*)array, prop, status );
}
@@ -553,7 +555,6 @@
mhdf_open_table( hid_t group_id,
const char* path,
int columns,
- int parallel,
hsize_t* rows_out,
mhdf_Status* status )
{
@@ -566,12 +567,6 @@
#else
table_id = H5Dopen( group_id, path );
#endif
-
-#ifdef USE_MPI
- if (parallel)
- H5Pset_dxpl_mpio(group_id, H5FD_MPIO_COLLECTIVE);
-#endif
-
if (table_id < 0)
{
mhdf_setFail( status, "HDF5 DataSet creation failed.");
@@ -613,7 +608,6 @@
mhdf_open_table2( hid_t group_id,
const char* path,
int rank,
- int parallel,
hsize_t* dims_out,
long* start_id_out,
mhdf_Status* status )
@@ -625,12 +619,6 @@
#else
table_id = H5Dopen( group_id, path );
#endif
-
-#ifdef USE_MPI
- if (parallel)
- H5Pset_dxpl_mpio(group_id, H5FD_MPIO_COLLECTIVE);
-#endif
-
if (table_id < 0)
{
mhdf_setFail( status, "HDF5 DataSet creation failed.");
Modified: MOAB/trunk/mhdf/src/util.h
===================================================================
--- MOAB/trunk/mhdf/src/util.h 2008-07-08 19:10:29 UTC (rev 2000)
+++ MOAB/trunk/mhdf/src/util.h 2008-07-09 16:05:39 UTC (rev 2001)
@@ -73,6 +73,7 @@
long count,
hid_t type,
void* array,
+ hid_t read_prop,
mhdf_Status* status );
@@ -82,6 +83,7 @@
long count,
hid_t type,
const void* array,
+ hid_t write_prop,
mhdf_Status* status );
int
@@ -91,6 +93,7 @@
long count,
hid_t type,
void* array,
+ hid_t read_prop,
mhdf_Status* status );
@@ -101,6 +104,7 @@
long count,
hid_t type,
const void* array,
+ hid_t write_prop,
mhdf_Status* status );
hid_t
@@ -115,7 +119,6 @@
mhdf_open_table( hid_t group,
const char* path,
int columns,
- int parallel,
hsize_t* rows_out,
mhdf_Status* status );
@@ -123,7 +126,6 @@
mhdf_open_table2( hid_t group,
const char* path,
int rank,
- int parallel,
hsize_t* dims_out,
long* start_id_out,
mhdf_Status* status );
More information about the moab-dev
mailing list