Changeset 1642 for XIOS/dev/branch_openmp/src/mpi.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/mpi.hpp (modified) (1 diff)

XIOS/dev/branch_openmp/src/mpi.hpp

@@ -10 +10 @@
 /* skip C++ Binding for OpenMPI */
 #define OMPI_SKIP_MPICXX
+
 #ifdef _usingEP
-  #include <omp.h>
-  #include "../extern/src_ep_dev/ep_lib.hpp"
-  #include "../extern/src_ep_dev/ep_declaration.hpp"
-  //using namespace ep_lib;
-#elif _usingMPI
-  #include <mpi.h>
+#include "ep_lib.hpp"
+#include "ep_declaration.hpp"
 #endif
 
+#include <mpi.h>
+
+#ifdef _usingMPI
+
+#define ep_lib  
+
+#define EP_INT MPI_INT
+#define EP_FLOAT MPI_FLOAT
+#define EP_DOUBLE MPI_DOUBLE
+#define EP_CHAR MPI_CHAR
+#define EP_LONG MPI_LONG
+#define EP_LONG_LONG_INT MPI_LONG_LONG_INT
+#define EP_UNSIGNED_LONG  MPI_UNSIGNED_LONG
+#define EP_UNSIGNED_CHAR  MPI_UNSIGNED_CHAR
+
+
+#define EP_COMM_WORLD MPI_COMM_WORLD
+#define EP_COMM_NULL MPI_COMM_NULL
+#define EP_INFO_NULL MPI_INFO_NULL
+
+#define EP_MAX MPI_MAX
+#define EP_MIN MPI_MIN
+#define EP_SUM MPI_SUM
+#define EP_LOR MPI_LOR
 
 #endif
+
+#endif