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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-05-31 19:03:30 -0500 (Thu, 31 May 2012)
New Revision: 5537

Modified:
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/tools/convert.cpp
Log:
- when running mbconvert with both -M and -P or -p options, turn off parallel
writing option (since that's what's implied by -P or -p)
- write a meaningful error message when serial hdf5 writer fails due to
not implementing parallel open file
- make default writer parallel hdf5 if it's enabled



Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2012-05-31 22:31:51 UTC (rev 5536)
+++ MOAB/trunk/src/Core.cpp	2012-06-01 00:03:30 UTC (rev 5537)
@@ -66,8 +66,13 @@
 #endif
 
 #ifdef HDF5_FILE
-#  include "WriteHDF5.hpp"
-   typedef moab::WriteHDF5 DefaultWriter;
+#  ifdef HDF5_PARALLEL
+#    include "WriteHDF5Parallel.hpp"
+     typedef moab::WriteHDF5Parallel DefaultWriter;
+#  else
+#    include "WriteHDF5.hpp"
+     typedef moab::WriteHDF5 DefaultWriter;
+#  endif
 #elif defined(NETCDF_FILE)
 #  include "WriteNCDF.hpp"
    typedef moab::WriteNCDF DefaultWriter;

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2012-05-31 22:31:51 UTC (rev 5536)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2012-06-01 00:03:30 UTC (rev 5537)
@@ -2520,6 +2520,7 @@
                                     int,
                                     double*  )
 {
+  writeUtil->report_error("WriteHDF5 does not support parallel writing.\n");
   return error(MB_NOT_IMPLEMENTED);
 }
 

Modified: MOAB/trunk/tools/convert.cpp
===================================================================
--- MOAB/trunk/tools/convert.cpp	2012-05-31 22:31:51 UTC (rev 5536)
+++ MOAB/trunk/tools/convert.cpp	2012-06-01 00:03:30 UTC (rev 5537)
@@ -274,7 +274,8 @@
   if (parallel) {
     read_opts.push_back("PARALLEL=READ_PART");
     read_opts.push_back("PARTITION=PARALLEL_PARTITION");
-    write_opts.push_back("PARALLEL=WRITE_PART");
+    if (!append_rank && !percent_rank_subst)
+      write_opts.push_back("PARALLEL=WRITE_PART");
   }
   if (resolve_shared) read_opts.push_back("PARALLEL_RESOLVE_SHARED_ENTS");
   if (exchange_ghosts) read_opts.push_back("PARALLEL_GHOSTS=3.0.1");