Changeset 1460 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_declaration.cpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_declaration.cpp (modified) (5 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_declaration.cpp

@@ -24 +24 @@
 ::MPI_Datatype MPI_UNSIGNED_LONG_STD = MPI_UNSIGNED_LONG;
 ::MPI_Datatype MPI_UNSIGNED_CHAR_STD = MPI_UNSIGNED_CHAR;
+::MPI_Datatype MPI_UINT64_T_STD = MPI_UINT64_T;
 
 #undef MPI_INT
@@ -32 +33 @@
 #undef MPI_UNSIGNED_LONG
 #undef MPI_UNSIGNED_CHAR
+#undef MPI_UINT64_T
 
 
@@ -37 +39 @@
 ::MPI_Op MPI_MAX_STD = MPI_MAX;
 ::MPI_Op MPI_MIN_STD = MPI_MIN;
+::MPI_Op MPI_LOR_STD = MPI_LOR;
 
 #undef MPI_SUM
 #undef MPI_MAX
 #undef MPI_MIN
-
-
-/*#undef MPI_INT
-#undef MPI_FLOAT
-#undef MPI_DOUBLE
-#undef MPI_CHAR
-#undef MPI_LONG
-#undef MPI_UNSIGNED_LONG
-#undef MPI_UNSIGNED_CHAR
-
-#undef MPI_SUM
-#undef MPI_MAX
-#undef MPI_MIN
-
-#undef MPI_COMM_WORLD
-#undef MPI_COMM_NULL
-
-#undef MPI_STATUS_IGNORE
-#undef MPI_REQUEST_NULL
-#undef MPI_INFO_NULL
-*/
+#undef MPI_LOR
 
 
@@ -73 +56 @@
 extern ::MPI_Datatype MPI_UNSIGNED_LONG_STD;
 extern ::MPI_Datatype MPI_UNSIGNED_CHAR_STD;
+extern ::MPI_Datatype MPI_UINT64_T_STD;
+
 
 extern ::MPI_Op MPI_SUM_STD;
 extern ::MPI_Op MPI_MAX_STD;
 extern ::MPI_Op MPI_MIN_STD;
+extern ::MPI_Op MPI_LOR_STD;
 
 extern ::MPI_Comm MPI_COMM_WORLD_STD;
@@ -92 +78 @@
 ep_lib::MPI_Datatype MPI_UNSIGNED_LONG = &MPI_UNSIGNED_LONG_STD;
 ep_lib::MPI_Datatype MPI_UNSIGNED_CHAR = &MPI_UNSIGNED_CHAR_STD;
+ep_lib::MPI_Datatype MPI_UINT64_T = &MPI_UINT64_T_STD;
+
 
 ep_lib::MPI_Op MPI_SUM = &MPI_SUM_STD;
 ep_lib::MPI_Op MPI_MAX = &MPI_MAX_STD;
 ep_lib::MPI_Op MPI_MIN = &MPI_MIN_STD;
+ep_lib::MPI_Op MPI_LOR = &MPI_LOR_STD;
 
 ep_lib::MPI_Comm MPI_COMM_WORLD(&MPI_COMM_WORLD_STD);