Changeset 1540 for XIOS/dev/branch_openmp/extern/ep_dev/ep_reduce.cpp

Timestamp:

06/12/18 14:21:57 (6 years ago)

Author:

yushan

Message:

add modif for workflow_cmip6

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_reduce.cpp (modified) (7 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_reduce.cpp

@@ -124 +124 @@
         }
 
-        else if(datatype == MPI_UINT64_T)
-        {
-          assert(datasize == sizeof(uint64_t));
-          for(int i=1; i<num_ep; i++)
-            reduce_max<uint64_t>(static_cast<uint64_t*>(comm->my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
-        }
-        
         else if(datatype == MPI_LONG_LONG_INT)
         {
@@ -138 +131 @@
         }
 
-        else printf("datatype Error\n");
-
-      }
-
-      if(op == MPI_MIN)
+        else 
+        {
+          printf("datatype Error in ep_reduce : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
+
+      }
+
+      else if(op == MPI_MIN)
       {
         if(datatype ==MPI_INT)
@@ -186 +183 @@
         }
 
-        else if(datatype == MPI_UINT64_T)
-        {
-          assert(datasize == sizeof(uint64_t));
-          for(int i=1; i<num_ep; i++)
-            reduce_min<uint64_t>(static_cast<uint64_t*>(comm->my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
-        }
-        
         else if(datatype == MPI_LONG_LONG_INT)
         {
@@ -200 +190 @@
         }
 
-        else printf("datatype Error\n");
-
-      }
-
-
-      if(op == MPI_SUM)
+        else 
+        {
+          printf("datatype Error in ep_reduce : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
+
+      }
+
+
+      else if(op == MPI_SUM)
       {
         if(datatype==MPI_INT)
@@ -247 +241 @@
           for(int i=1; i<num_ep; i++)
             reduce_sum<unsigned long>(static_cast<unsigned long*>(comm->my_buffer->void_buffer[i]), static_cast<unsigned long*>(recvbuf), count);
-        }
-
-        else if(datatype ==MPI_UINT64_T)
-        {
-          assert(datasize == sizeof(uint64_t));
-          for(int i=1; i<num_ep; i++)
-            reduce_sum<uint64_t>(static_cast<uint64_t*>(comm->my_buffer->void_buffer[i]), static_cast<uint64_t*>(recvbuf), count);
         }
         
@@ -263 +250 @@
         }
 
-        else printf("datatype Error\n");
-
-      }
-
-      if(op == MPI_LOR)
+        else 
+        {
+          printf("datatype Error in ep_reduce : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
+
+      }
+
+      else if(op == MPI_LOR)
       {
         if(datatype != MPI_INT)
@@ -277 +268 @@
             reduce_lor<int>(static_cast<int*>(comm->my_buffer->void_buffer[i]), static_cast<int*>(recvbuf), count);
         }
+      }
+      
+      else
+      {
+        printf("op type Error in ep_reduce : MPI_MAX, MPI_MIN, MPI_SUM, MPI_LOR\n");
+        MPI_Abort(comm, 0);
       }
     }