[MOAB-dev] r4366 - MOAB/trunk/src/io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-12-13 15:54:07 -0600 (Mon, 13 Dec 2010)
New Revision: 4366

Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/io/ReadHDF5Dataset.hpp
Log:
Add read option for parallel HDF5 that utilizes a local modification of the HDF5 library

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2010-12-13 21:33:35 UTC (rev 4365)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2010-12-13 21:54:07 UTC (rev 4366)
@@ -264,6 +264,10 @@
   rval = opts.get_int_option( "HYPERSLAB_SELECT_LIMIT", hslimit );
   if (MB_SUCCESS == rval && hslimit > 0)
     ReadHDF5Dataset::set_hyperslab_selection_limit( hslimit );
+  else
+    ReadHDF5Dataset::default_hyperslab_selection_limit();
+  if (MB_SUCCESS == opts.get_null_option( "HYERERSLAB_APPEND" ))
+    ReadHDF5Dataset::append_hyperslabs();
   
   dataBuffer = (char*)malloc( bufferSize );
   if (!dataBuffer)

Modified: MOAB/trunk/src/io/ReadHDF5Dataset.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2010-12-13 21:33:35 UTC (rev 4365)
+++ MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2010-12-13 21:54:07 UTC (rev 4366)
@@ -32,6 +32,8 @@
 void ReadHDF5Dataset::default_hyperslab_selection_limit()
   { hyperslabSelectionLimit = DEFAULT_HYPERSLAB_SELECTION_LIMIT; }
 
+H5S_seloper_t ReadHDF5Dataset::hyperslabSelectOp = H5S_SELECT_OR;
+
 #ifdef USE_MPE
 static std::pair<int,int> allocate_mpe_state( const char* name, const char* color )
 {
@@ -245,7 +247,7 @@
       err = H5Sselect_hyperslab( dataSpace, sop, dataSetOffset, NULL, dataSetCount, 0 );
       if (err < 0)
         throw Exception(__LINE__);
-      sop = H5S_SELECT_OR; // subsequent calls to select_hyperslab append
+      sop = hyperslabSelectOp; // subsequent calls to select_hyperslab append
 
       currOffset += count;
     }

Modified: MOAB/trunk/src/io/ReadHDF5Dataset.hpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5Dataset.hpp	2010-12-13 21:33:35 UTC (rev 4365)
+++ MOAB/trunk/src/io/ReadHDF5Dataset.hpp	2010-12-13 21:54:07 UTC (rev 4366)
@@ -12,6 +12,7 @@
 
 #include <stdlib.h> // for size_t
 #include <H5Ipublic.h>
+#include <H5Spublic.h>
 
 #include "moab/Range.hpp"
 #include <vector>