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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-05-14 11:28:09 -0500 (Fri, 14 May 2010)
New Revision: 3901

Modified:
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/io/mhdf/include/mhdf.h
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.hpp
Log:
improved debug output and optional use of collective IO calls for WriteHDF5

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-14 16:27:17 UTC (rev 3900)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-14 16:28:09 UTC (rev 3901)
@@ -217,6 +217,12 @@
   return (A);                                   \
 } while(false)
 
+
+#define debug_barrier() debug_barrier_line(__LINE__)
+void WriteHDF5::debug_barrier_line(int )
+{
+}
+
 bool WriteHDF5::convert_handle_tag( const EntityHandle* source,
                                     EntityHandle* dest, size_t count ) const
 {
@@ -291,6 +297,8 @@
     writeSetContents(false),
     writeSetChildren(false),
     writeSetParents(false),
+    parallelWrite(false),
+    collectiveIO(false),
     writeProp( H5P_DEFAULT ),
     dbgOut("H5M ", stderr)
 {
@@ -339,22 +347,6 @@
   return MB_SUCCESS;
 }
 
-void WriteHDF5::tprint( const char* fmt, ... )
-{
-  if (dbgOut.get_verbosity()) {
-    static const clock_t t0 = clock();
-    va_list args;
-    va_start(args, fmt);
-    char buffer[128]; 
-    size_t n = snprintf( buffer, sizeof(buffer), "%6.2f: ", (double)(clock()-t0)/CLOCKS_PER_SEC );
-    vsnprintf( buffer+n, sizeof(buffer)-n, fmt, args );
-    dbgOut.print(1,buffer);
-    va_end(args);
-  }
-}
-
-
-
 WriteHDF5::~WriteHDF5()
 {
   if (!writeUtil) // init() failed.
@@ -375,6 +367,9 @@
                                    int user_dimension )