[MOAB-dev] r4925 - in MOAB/trunk: src src/io src/parallel tools

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-02 10:50:06 -0500 (Thu, 02 Jun 2011)
New Revision: 4925

Modified:
   MOAB/trunk/src/DebugOutput.hpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.hpp
   MOAB/trunk/tools/convert.cpp
Log:
o Add option to disable hyperslab append for HDF5 writer
o Limit debug output to first 32 procs for HDF5 read/write
o Limit non-error output of mbconvert to root process only



Modified: MOAB/trunk/src/DebugOutput.hpp
===================================================================
--- MOAB/trunk/src/DebugOutput.hpp	2011-06-02 15:45:42 UTC (rev 4924)
+++ MOAB/trunk/src/DebugOutput.hpp	2011-06-02 15:50:06 UTC (rev 4925)
@@ -135,6 +135,10 @@
   //!       or zero if MOAB is build w/out MPI.
   void use_world_rank();
   
+  //!\brief Only print debug output from N processes
+  void limit_output_to_first_N_procs( int N )
+    { if (mpiRank >= N) verbosityLimit = 0; }
+  
   //!\brief Get verbosity limit
   unsigned get_verbosity() const      { return verbosityLimit; }
   //!\brief Set verbosity limit

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2011-06-02 15:45:42 UTC (rev 4924)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2011-06-02 15:50:06 UTC (rev 4925)
@@ -304,6 +304,7 @@
     dbgOut.set_verbosity(tmpval);
     dbgOut.set_prefix("H5M ");
   }
+  dbgOut.limit_output_to_first_N_procs( 32 );
   
   // Enable some extra checks for reads.  Note: amongst other things this
   // will print errors if the entire file is not read, so if doing a 

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2011-06-02 15:45:42 UTC (rev 4924)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2011-06-02 15:50:06 UTC (rev 4925)
@@ -636,15 +636,13 @@
   int junk;
   parallelWrite = (MB_SUCCESS == opts.match_option( "PARALLEL", optnames, junk ));
   if (parallelWrite) {
-    int pcomm_no = 0;
-    opts.get_int_option("PARALLEL_COMM", pcomm_no);
       // Just store Boolean value based on string option here.
       // parallel_create_file will set writeProp accordingly.
     //collectiveIO =  (MB_SUCCESS == opts.get_null_option("COLLECTIVE"));
     //dbgOut.printf(2,"'COLLECTIVE' option = %s\n", collectiveIO ? "YES" : "NO" );
       // Do this all the time, as it appears to be much faster than indep in some cases
     collectiveIO = true;
-    result = parallel_create_file( filename, overwrite, qa_records, tag_list, num_tags, user_dimension, pcomm_no, times );
+    result = parallel_create_file( filename, overwrite, qa_records, opts, tag_list, num_tags, user_dimension, times );
   }
   else {
     result = serial_create_file( filename, overwrite, qa_records, tag_list, num_tags, user_dimension );
@@ -2491,10 +2489,10 @@