[MOAB-dev] r2004 - MOAB/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-07-09 12:31:02 -0500 (Wed, 09 Jul 2008)
New Revision: 2004

Modified:
   MOAB/trunk/ReadHDF5.cpp
Log:
test HDF5_PARALLEL rather than USE_MPI in preproc directives because MPI is necessary but not sufficient

Modified: MOAB/trunk/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/ReadHDF5.cpp	2008-07-09 17:28:02 UTC (rev 2003)
+++ MOAB/trunk/ReadHDF5.cpp	2008-07-09 17:31:02 UTC (rev 2004)
@@ -34,7 +34,7 @@
 #include "ReadHDF5.hpp"
 #include "MBCN.hpp"
 #include "FileOptions.hpp"
-#ifdef USE_MPI
+#ifdef HDF5_PARALLEL
 #include "ReadParallel.hpp"
 #include <H5FDmpi.h>
 #include <H5FDmpio.h>
@@ -134,7 +134,7 @@
 
   bool use_mpio = (MB_SUCCESS == opts.get_null_option("USE_MPIO"));
   if (use_mpio) {
-#ifndef USE_MPI
+#ifndef HDF5_PARALLEL
     return MB_NOT_IMPLEMENTED;
 #else
     int parallel_mode;
@@ -164,7 +164,7 @@
   
     // Open the file
   hid_t file_prop = H5P_DEFAULT;
-#ifdef USE_MPI
+#ifdef HDF5_PARALLEL
   if (use_mpio) {
     file_prop = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_mpio(file_prop, MPI_COMM_WORLD, MPI_INFO_NULL);