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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-02 13:35:25 -0500 (Thu, 02 Jun 2011)
New Revision: 4929

Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
Log:
fix debug output for HDF5 reader

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2011-06-02 18:34:59 UTC (rev 4928)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2011-06-02 18:35:25 UTC (rev 4929)
@@ -339,21 +339,6 @@
     return error(MB_INVALID_SIZE);
   }
   
-  ReadHDF5Dataset::default_hyperslab_selection_limit();
-  int hslimit;
-  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("HYPERSLAB_OR") &&
-     (MB_SUCCESS == opts.get_null_option( "HYPERSLAB_APPEND" )
-      || HDF5_can_append_hyperslabs())) {
-    ReadHDF5Dataset::append_hyperslabs();
-    if (MB_SUCCESS != opts.get_int_option( "HYPERSLAB_SELECT_LIMIT", hslimit ))
-      ReadHDF5Dataset::set_hyperslab_selection_limit( std::numeric_limits<int>::max() );
-  }
-  
   dataBuffer = (char*)malloc( bufferSize );
   if (!dataBuffer)
     return error(MB_MEMORY_ALLOCATION_FAILED);
@@ -395,6 +380,7 @@
     }
     const int rank = myPcomm->proc_config().proc_rank();
     dbgOut.set_rank(rank);
+    dbgOut.limit_output_to_first_N_procs( 32 );
     mpiComm = new MPI_Comm(myPcomm->proc_config().proc_comm());
 
 #ifndef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS 
@@ -506,6 +492,22 @@
     }
   }
   
+  ReadHDF5Dataset::default_hyperslab_selection_limit();
+  int hslimit;
+  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("HYPERSLAB_OR") &&
+     (MB_SUCCESS == opts.get_null_option( "HYPERSLAB_APPEND" )
+      || HDF5_can_append_hyperslabs())) {
+    ReadHDF5Dataset::append_hyperslabs();
+    if (MB_SUCCESS != opts.get_int_option( "HYPERSLAB_SELECT_LIMIT", hslimit ))
+      ReadHDF5Dataset::set_hyperslab_selection_limit( std::numeric_limits<int>::max() );