[MOAB-dev] r5369 - in MOAB/trunk: examples src/parallel src/parallel/moab

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-02-02 10:03:00 -0600 (Thu, 02 Feb 2012)
New Revision: 5369

Modified:
   MOAB/trunk/examples/Makefile.am
   MOAB/trunk/examples/SetsNTags.cpp
   MOAB/trunk/src/parallel/Makefile.am
   MOAB/trunk/src/parallel/TupleList.cpp
   MOAB/trunk/src/parallel/moab/TupleList.hpp
Log:
Few changes to TupleList stuff to make auto tests work.  Also a misc change
to SetsNTags for parallel running.  make check all works.




Modified: MOAB/trunk/examples/Makefile.am
===================================================================
--- MOAB/trunk/examples/Makefile.am	2012-02-01 19:25:59 UTC (rev 5368)
+++ MOAB/trunk/examples/Makefile.am	2012-02-02 16:03:00 UTC (rev 5369)
@@ -16,6 +16,7 @@
 LDADD = ../src/libMOAB.la
 AM_CPPFLAGS += -I../src \
                -I$(srcdir)/../src \
+               -I$(srcdir)/../src/parallel \
                -I$(srcdir)/../src/oldinc
 
 FileRead_SOURCES = FileRead.cpp

Modified: MOAB/trunk/examples/SetsNTags.cpp
===================================================================
--- MOAB/trunk/examples/SetsNTags.cpp	2012-02-01 19:25:59 UTC (rev 5368)
+++ MOAB/trunk/examples/SetsNTags.cpp	2012-02-02 16:03:00 UTC (rev 5369)
@@ -1,6 +1,11 @@
 #include "moab/Core.hpp"
 #include "moab/Interface.hpp"
 #include "moab/Range.hpp"
+
+#ifdef USE_MPI
+#include "moab_mpi.h"
+#endif
+
 #include <iostream>
 
 int main(int argc, char **argv) {
@@ -20,7 +25,7 @@
     std::cout << "Usage: " << argv[0] << "[-p] <filename>" << std::endl;
     return 0;
   }
-  
+
   if (parallel) 
     rval = mb->load_file(argv[argc-1], 0, par_opt);
   else
@@ -68,5 +73,15 @@
   rval = mb->list_entities(sets);
   if (moab::MB_SUCCESS != rval) return 1;
 
+  rval = mb->list_entities(NULL, 1);
+  
+#ifdef USE_MPI
+  if (parallel) {
+    MPI_Barrier(MPI_COMM_WORLD);
+    std::cout << std::flush;
+    std::cerr << std::flush;
+  }
+#endif