[MOAB-dev] r4805 - in MOAB/trunk: src/io src/io/mhdf/example src/io/mhdf/include src/io/mhdf/src src/parallel test/h5file test/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-05-06 16:31:47 -0500 (Fri, 06 May 2011)
New Revision: 4805

Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/mhdf/example/info.c
   MOAB/trunk/src/io/mhdf/example/validate.c
   MOAB/trunk/src/io/mhdf/include/mhdf.h
   MOAB/trunk/src/io/mhdf/src/adjacency.c
   MOAB/trunk/src/io/mhdf/src/connectivity.c
   MOAB/trunk/src/io/mhdf/src/file-handle.c
   MOAB/trunk/src/io/mhdf/src/file-handle.h
   MOAB/trunk/src/io/mhdf/src/file.c
   MOAB/trunk/src/io/mhdf/src/sets.c
   MOAB/trunk/src/io/mhdf/src/tags.c
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/test/h5file/dump_sets.c
   MOAB/trunk/test/parallel/mhdf_parallel.c
Log:
eliminate data conversion during HDF5 write by being consistent about the types used

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2011-05-06 16:30:39 UTC (rev 4804)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2011-05-06 21:31:47 UTC (rev 4805)
@@ -411,7 +411,7 @@
         err = H5Pset_fapl_mpio(file_prop, MPI_COMM_SELF, MPI_INFO_NULL);
         assert(file_prop >= 0);
         assert(err >= 0);
-        filePtr = mhdf_openFileWithOpt( pfilename.c_str(), 0, NULL, file_prop, &status );
+        filePtr = mhdf_openFileWithOpt( pfilename.c_str(), 0, NULL, handleType, file_prop, &status );
         H5Pclose( file_prop );
 
         if (filePtr) {  
@@ -456,7 +456,7 @@
 
       // re-open file in parallel
     dbgOut.tprintf( 1, "Opening \"%s\" for parallel IO\n", pfilename.c_str() );
-    filePtr = mhdf_openFileWithOpt( pfilename.c_str(), 0, NULL, file_prop, &status );
+    filePtr = mhdf_openFileWithOpt( pfilename.c_str(), 0, NULL, handleType, file_prop, &status );
 
     H5Pclose( file_prop );
     if (!filePtr)
@@ -485,7 +485,7 @@
   else {
   
       // Open the file
-    filePtr = mhdf_openFile( filename, 0, NULL, &status );
+    filePtr = mhdf_openFile( filename, 0, NULL, handleType, &status );
     if (!filePtr)
     {
       readUtil->report_error( "%s", mhdf_message( &status ));

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2011-05-06 16:30:39 UTC (rev 4804)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2011-05-06 21:31:47 UTC (rev 4805)
@@ -1390,8 +1390,8 @@
   dbgOut.print(3,"Non-shared sets", setSet.range );
    
     /* counts and buffers and such */
-  long* const buffer = reinterpret_cast<long*>(dataBuffer);
-  const size_t buffer_size = bufferSize / (4*sizeof(long));
+  mhdf_index_t* const buffer = reinterpret_cast<mhdf_index_t*>(dataBuffer);
+  const size_t buffer_size = bufferSize / (4*sizeof(mhdf_index_t));
   const size_t num_local_writes = (setSet.range.size() + buffer_size - 1) / buffer_size;
   const size_t num_global_writes = (setSet.max_num_ents + buffer_size-1) / buffer_size;
   assert(num_local_writes <= num_global_writes);
@@ -1404,12 +1404,12 @@
   Range::const_iterator i = setSet.range.begin();
   Range::const_iterator r = ranged_sets.begin();
   Range::const_iterator s = null_stripped_sets.begin();