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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-09-03 09:56:51 -0500 (Fri, 03 Sep 2010)
New Revision: 4121

Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
Log:
Fix broken HDF5 reader.

Apologies for all the nightly test failures.  I changed a #define to
enable alternate code for reading vertices but did not test that code
because I had mistakenly thought I had tested it with the last round
of (significant) reader changes.


Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2010-09-02 19:48:36 UTC (rev 4120)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2010-09-03 14:56:51 UTC (rev 4121)
@@ -597,7 +597,7 @@
       return error(rval);
   }
 
-  dbgOut.print_ints( 3, "Set file IDs for partial read: ", file_ids );
+  dbgOut.print_ints( 2, "Set file IDs for partial read: ", file_ids );
   
   dbgOut.tprint( 1, "GATHERING ADDITIONAL ENTITIES\n" );
   
@@ -630,6 +630,8 @@
       return error(rval);
   }
   
+  debug_barrier();
+  
     // get elements and vertices contained in sets
   rval = get_set_contents( sets, file_ids );
   if (MB_SUCCESS != rval)
@@ -1067,7 +1069,8 @@
 #ifdef BLOCKED_COORD_IO
   try {
     for (int d = 0; d < dim; ++d) {
-      ReadHDF5Dataset reader( data_id, H5T_NATIVE_DOUBLE, d );
+      ReadHDF5Dataset reader( data_id, H5T_NATIVE_DOUBLE, false );
+      reader.set_column( d );
       reader.set_file_ids( node_file_ids, fileInfo->nodes.start_id, collIO, mpiComm );
       dbgOut.tprintf(1,"Reading Node %c Coords (mode=%s)\n",(char)('X' + d),reader.get_mode_str()); 
       // should normally only have one read call, unless sparse nature
@@ -1814,6 +1817,7 @@
         break;
     }
     new_children = subtract( children,  sets_in_out );
+    dbgOut.print_ints( 2, "Adding additional contained/child sets", new_children );
     sets_in_out.merge( new_children );
   } while (!new_children.empty());
   
@@ -1997,6 +2001,9 @@
                                     hid_t child_handle,
                                     Range& child_file_ids )
 {
+
+  dbgOut.tprintf(2,"Reading child set IDs for %ld ranges\n", (long)input_file_ids.psize());
+
   mhdf_Status status;
   long* buffer = reinterpret_cast<long*>(dataBuffer);
   long buffer_size = bufferSize / sizeof(long);
@@ -2074,6 +2081,8 @@