[MOAB-dev] r4260 - in MOAB/trunk: config src/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-11-10 16:06:14 -0600 (Wed, 10 Nov 2010)
New Revision: 4260

Modified:
   MOAB/trunk/config/ccmio.m4
   MOAB/trunk/src/io/ReadHDF5.cpp
Log:
Rearranging code in the HDF5 writer to enable lockless reads on BG/P.

Making the default behavior to NOT look for ccmio.



Modified: MOAB/trunk/config/ccmio.m4
===================================================================
--- MOAB/trunk/config/ccmio.m4	2010-11-10 17:52:44 UTC (rev 4259)
+++ MOAB/trunk/config/ccmio.m4	2010-11-10 22:06:14 UTC (rev 4260)
@@ -16,10 +16,10 @@
 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-ccmio=\"${withval}\""
 ]
 , [CCMIO_ARG=])
-if test "xno" = "x$CCMIO_ARG"; then
+if test "xyes" = "x$CCMIO_ARG"; then
+  AC_MSG_RESULT([yes])
+else
   AC_MSG_RESULT([no])
-else
-  AC_MSG_RESULT([yes])
 fi
 
  # if CCMIO support is not disabled

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2010-11-10 17:52:44 UTC (rev 4259)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2010-11-10 22:06:14 UTC (rev 4260)
@@ -275,6 +275,7 @@
     free(dataBuffer);
     return MB_NOT_IMPLEMENTED;
 #else
+
     int pcomm_no = 0;
     rval = opts.get_int_option("PARALLEL_COMM", pcomm_no);
     if (rval == MB_TYPE_OUT_OF_RANGE) {
@@ -293,8 +294,13 @@
     dbgOut.tprint( 1, "Getting file summary\n" );
     fileInfo = 0;
     unsigned long size = 0;
+
+
+    /*
     if (rank == 0) {
+
       filePtr = mhdf_openFile( filename, 0, NULL, &status );
+     
       if (filePtr) {  
         fileInfo = mhdf_getFileSummary( filePtr, handleType, &status );
         if (!is_error(status)) {
@@ -308,24 +314,28 @@
         fileInfo = 0;
       }
     }
-      // Broadcast the size of the struct (zero indicates an error)
-    dbgOut.tprint( 1, "Communicating file summary\n" );