[MOAB-dev] r4163 - in MOAB/trunk/src: . parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-09-27 15:06:21 -0500 (Mon, 27 Sep 2010)
New Revision: 4163

Added:
   MOAB/trunk/src/moab_mpe.c
   MOAB/trunk/src/moab_mpe.h
Removed:
   MOAB/trunk/src/parallel/moab_mpe.c
   MOAB/trunk/src/parallel/moab_mpe.h
Modified:
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/parallel/Makefile.am
Log:
fix serial build

Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am	2010-09-27 20:01:11 UTC (rev 4162)
+++ MOAB/trunk/src/Makefile.am	2010-09-27 20:06:21 UTC (rev 4163)
@@ -114,7 +114,9 @@
   UnstructuredElemSeq.hpp \
   VarLenTag.hpp \
   VertexSequence.hpp \
-  VertexSequence.cpp 
+  VertexSequence.cpp \
+  moab_mpe.h \
+  moab_mpe.c
 
 # The list of header files which are to be installed
 nobase_libMOAB_la_include_HEADERS = \

Copied: MOAB/trunk/src/moab_mpe.c (from rev 4162, MOAB/trunk/src/parallel/moab_mpe.c)
===================================================================
--- MOAB/trunk/src/moab_mpe.c	                        (rev 0)
+++ MOAB/trunk/src/moab_mpe.c	2010-09-27 20:06:21 UTC (rev 4163)
@@ -0,0 +1,7 @@
+#include "moab_mpe.h"
+
+int MPE_Allocate_event()
+{
+  static int counter = MOAB_MPE_FIRST_EVENT;
+  return counter++;
+}

Copied: MOAB/trunk/src/moab_mpe.h (from rev 4162, MOAB/trunk/src/parallel/moab_mpe.h)
===================================================================
--- MOAB/trunk/src/moab_mpe.h	                        (rev 0)
+++ MOAB/trunk/src/moab_mpe.h	2010-09-27 20:06:21 UTC (rev 4163)
@@ -0,0 +1,89 @@
+#ifndef MOAB_MPE_H
+#define MOAB_MPE_H
+
+#define MOAB_MPE_FIRST_EVENT 101
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  int MPE_Allocate_event();
+#ifdef __cplusplus
+ } /* extern "C" */
+#endif
+
+
+#ifdef USE_MPE
+# include "moab_mpi.h"
+# include "mpe.h"