[MOAB-dev] r4368 - in MOAB/trunk: . config src/io src/parallel test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-14 09:22:03 -0600 (Tue, 14 Dec 2010)
New Revision: 4368

Modified:
   MOAB/trunk/config/ccmio.m4
   MOAB/trunk/config/compiler.m4
   MOAB/trunk/config/netcdf.m4
   MOAB/trunk/configure.ac
   MOAB/trunk/src/io/Makefile.am
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/test/parallel/Makefile.am
Log:
ReadParallel.cpp: automatically create the partition tag if none is input
ReadNC: enable support for pnetcdf and parallel reading
configure.ac, config/netcdf.m4: change default to not look for netcdf unless requested with --with-netcdf; also
  enable looking for pnetcdf
ccmio.m4: change default so it really doesn't look for ccmio
compiler.m4: add --with-mpi= to DISTCHECK_CONFIGURE_FLAGS if it was input
test/parallel/Makefile.am: add some temp files to the list

Passes make distcheck.



Modified: MOAB/trunk/config/ccmio.m4
===================================================================
--- MOAB/trunk/config/ccmio.m4	2010-12-13 22:49:00 UTC (rev 4367)
+++ MOAB/trunk/config/ccmio.m4	2010-12-14 15:22:03 UTC (rev 4368)
@@ -24,7 +24,7 @@
 
  # if CCMIO support is not disabled
 HAVE_CCMIO=no
-if test "xno" != "x$CCMIO_ARG"; then
+if test "xyes" = "x$CCMIO_ARG"; then
   HAVE_CCMIO=yes
 
     # if a path is specified, update LIBS and INCLUDES accordingly

Modified: MOAB/trunk/config/compiler.m4
===================================================================
--- MOAB/trunk/config/compiler.m4	2010-12-13 22:49:00 UTC (rev 4367)
+++ MOAB/trunk/config/compiler.m4	2010-12-14 15:22:03 UTC (rev 4368)
@@ -83,6 +83,7 @@
   CXX_LIST="mpiCC mpCC mpicxx"
   FC_LIST="mpif90"
   F77_LIST="mpif77"
+  DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-mpi=\"${withval}\""
   
   if test "xyes" == "x$WITH_MPI"; then
     FATHOM_SET_MPI_COMPILER([CC],  [$CC_LIST])

Modified: MOAB/trunk/config/netcdf.m4
===================================================================
--- MOAB/trunk/config/netcdf.m4	2010-12-13 22:49:00 UTC (rev 4367)
+++ MOAB/trunk/config/netcdf.m4	2010-12-14 15:22:03 UTC (rev 4368)
@@ -28,10 +28,10 @@
 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-netcdf=\"${withval}\""
 ]
 , [NETCDF_ARG=])
-if test "xno" = "x$NETCDF_ARG"; then
+if test "xyes" = "x$NETCDF_ARG"; then
+  AC_MSG_RESULT([yes])
+else
   AC_MSG_RESULT([no])
-else
-  AC_MSG_RESULT([yes])
 fi
 
  # if NetCDF support is not disabled
@@ -141,3 +141,128 @@
 fi
 
 ]) # FATHOM_HAVE_NETCDF
+
+AC_DEFUN([FATHOM_CHECK_PNETCDF],[