[MOAB-dev] r4682 - in MOAB/trunk/src: io io/mhdf/src parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-03-29 13:48:09 -0500 (Tue, 29 Mar 2011)
New Revision: 4682

Modified:
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/io/mhdf/src/util.c
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
work around issues with HDF5 1.8.6 and earlier versions of HDF5 lib build with debugging enabled

Modified: MOAB/trunk/src/io/ReadHDF5Dataset.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2011-03-29 18:42:13 UTC (rev 4681)
+++ MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2011-03-29 18:48:09 UTC (rev 4682)
@@ -288,7 +288,7 @@
   if (err < 0)
     throw Exception(__LINE__);
   
-#if HDF5_16API
+//#if HDF5_16API
   hsize_t one = 1;
   hid_t mem_id = H5Screate_simple( 1, &one, NULL );
   if (mem_id < 0)
@@ -298,11 +298,11 @@
     H5Sclose(mem_id);
     throw Exception(__LINE__);
   }
-#else
-  hid_t mem_id = H5Screate(H5S_NULL);
-  if (mem_id < 0)
-    throw Exception(__LINE__);
-#endif
+//#else
+//  hid_t mem_id = H5Screate(H5S_NULL);
+//  if (mem_id < 0)
+//    throw Exception(__LINE__);
+//#endif
 
   err = H5Dread( dataSet, fileType, mem_id, dataSpace, ioProp, 0 );
   H5Sclose( mem_id );

Modified: MOAB/trunk/src/io/mhdf/src/util.c
===================================================================
--- MOAB/trunk/src/io/mhdf/src/util.c	2011-03-29 18:42:13 UTC (rev 4681)
+++ MOAB/trunk/src/io/mhdf/src/util.c	2011-03-29 18:48:09 UTC (rev 4682)
@@ -307,9 +307,9 @@
   hsize_t offsets[2], counts[2] = {1,1};
   herr_t rval;
   int dims;
-#if (1000 * H5_VERS_MAJOR + H5_VERS_MINOR) < 1008
+/*#if (1000 * H5_VERS_MAJOR + H5_VERS_MINOR) < 1008*/
   const hsize_t one = 1;
-#endif
+/*#endif*/
   
   if (offset < 0 || count < 0)
   {
@@ -370,15 +370,15 @@
   if (count)
     mem_id = H5Screate_simple( dims, counts, NULL );
   else {