[MOAB-dev] r4370 - in MOAB/trunk: config src/io src/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-14 14:26:06 -0600 (Tue, 14 Dec 2010)
New Revision: 4370

Modified:
   MOAB/trunk/config/netcdf.m4
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/io/WriteNCDF.cpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
Properly assign file ids to entities read in parallel and resolve shared ents, so we end up with
the correct number of entities in parallel.

Also:
ReadParallel.cpp: a little spacing change
WriteNCDF.cpp, ReadHDF5.cpp, ReadHDF5Dataset.cpp: removing warnings
netcdf.m4: correct the check for MPI for pnetcdf

Passes make distcheck.



Modified: MOAB/trunk/config/netcdf.m4
===================================================================
--- MOAB/trunk/config/netcdf.m4	2010-12-14 17:10:22 UTC (rev 4369)
+++ MOAB/trunk/config/netcdf.m4	2010-12-14 20:26:06 UTC (rev 4370)
@@ -28,7 +28,7 @@
 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-netcdf=\"${withval}\""
 ]
 , [NETCDF_ARG=])
-if test "xyes" = "x$NETCDF_ARG"; then
+if test "xno" != "x$NETCDF_ARG"; then
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
@@ -156,7 +156,7 @@
 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-pnetcdf=\"${withval}\""
 ]
 , [PNETCDF_ARG=])
-if test "xyes" = "x$PNETCDF_ARG"; then
+if test "xno" != "x$PNETCDF_ARG"; then
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
@@ -166,13 +166,7 @@
 HAVE_PNETCDF=no
 if test "xno" != "x$PNETCDF_ARG"; then
   HAVE_PNETCDF=yes
-  HAVE_NETCDF=yes
 
-    # PNETCDF requires MPI too
-  if test "xyes" != "x$WITH_MPI"; then
-    AC_MSG_ERROR([Pnetcdf requires MPI/parallel configuration])
-  fi
-
     # Check for stream headers and set STRSTREAM_H_SPEC accordingly
   AC_LANG_PUSH([C++])
   AC_CHECK_HEADER( [strstream.h], [PNETCDF_DEF="<strstream.h>"], [
@@ -207,7 +201,16 @@
   
    # Check for C library
   AC_LANG_PUSH([C])
-  AC_CHECK_HEADERS( [pnetcdf.h], [], [AC_MSG_WARN([[Pnetcdf header not found.]]); HAVE_PNETCDF=no] )
+  AC_CHECK_HEADERS( [pnetcdf.h], [], [HAVE_PNETCDF=no] )
+
+    # PNETCDF requires MPI too
+  if test "xyes" != "x$WITH_MPI"; then
+    if test "x" != "x$PNETCDF_ARG"; then
+      AC_MSG_ERROR([Pnetcdf requires MPI/parallel configuration])
+    fi
+    HAVE_PNETCDF=no
+  fi
+