[MOAB-dev] r4373 - in MOAB/trunk/src: . io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-14 18:31:38 -0600 (Tue, 14 Dec 2010)
New Revision: 4373

Modified:
   MOAB/trunk/src/ReaderWriterSet.cpp
   MOAB/trunk/src/io/Makefile.am
   MOAB/trunk/src/io/ReadNC.cpp
Log:
Fix inconsistent include of ReadNC, this should fix the auto build.



Modified: MOAB/trunk/src/ReaderWriterSet.cpp
===================================================================
--- MOAB/trunk/src/ReaderWriterSet.cpp	2010-12-14 21:02:27 UTC (rev 4372)
+++ MOAB/trunk/src/ReaderWriterSet.cpp	2010-12-15 00:31:38 UTC (rev 4373)
@@ -49,6 +49,11 @@
 #  include "ReadNC.hpp"
 #endif
 
+// 2nd include of ReadNC in case we have pnetcdf and not netcdf
+#ifdef PNETCDF_FILE 
+#  include "ReadNC.hpp"
+#endif
+
 #ifdef CCMIO_FILE
 #  include "ReadCCMIO.hpp"
 #  include "WriteCCMIO.hpp"

Modified: MOAB/trunk/src/io/Makefile.am
===================================================================
--- MOAB/trunk/src/io/Makefile.am	2010-12-14 21:02:27 UTC (rev 4372)
+++ MOAB/trunk/src/io/Makefile.am	2010-12-15 00:31:38 UTC (rev 4373)
@@ -15,14 +15,17 @@
 if NETCDF_FILE
   MOAB_NETCDF_SRCS = ReadNCDF.cpp  ReadNCDF.hpp \
                      WriteNCDF.cpp WriteNCDF.hpp \
-                     WriteSLAC.cpp WriteSLAC.hpp
+                     WriteSLAC.cpp WriteSLAC.hpp \
+		     ReadNC.cpp ReadNC.hpp
 else
   MOAB_NETCDF_SRCS =
 endif
 
 if PNETCDF_FILE
+if !NETCDF_FILE
      MOAB_NETCDF_SRCS += ReadNC.cpp ReadNC.hpp
 endif
+endif
 
 if HDF5_FILE
   libmoabio_la_LIBADD += mhdf/libmhdf.la

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2010-12-14 21:02:27 UTC (rev 4372)
+++ MOAB/trunk/src/io/ReadNC.cpp	2010-12-15 00:31:38 UTC (rev 4373)
@@ -425,7 +425,7 @@
   bool have_ij = true;
 #ifdef PNETCDF_FILE
     // whether we actually read anything depends on parallel and whether there's a k
-  if (!have_k && 0 != myPcomm->proc_config().proc_rank())
+  if (!have_k && -1 != kDim && 0 != myPcomm->proc_config().proc_rank())