Changeset 1540 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_exscan.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/src_ep_dev/ep_exscan.cpp (modified) (4 diffs)

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

@@ -122 +122 @@
           reduce_sum<unsigned long>(static_cast<unsigned long*>(comm->my_buffer->void_buffer[i]), static_cast<unsigned long*>(recvbuf), count);    
       }
-
-      else printf("datatype Error\n");
-
       
+      else if(datatype == MPI_LONG_LONG_INT )
+      {
+        assert(datasize == sizeof(long long int));
+        for(int i=0; i<ep_rank_loc; i++)
+          reduce_sum<long long int>(static_cast<long long int*>(comm->my_buffer->void_buffer[i]), static_cast<long long int*>(recvbuf), count);    
+      }
+
+      else 
+      {
+        printf("datatype Error in ep_exscan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
+
+      
     }
 
@@ -172 +183 @@
       }
      
-      else printf("datatype Error\n");
-    }
-
-    else //if(op == MPI_MIN)
+      else if(datatype == MPI_LONG_LONG_INT )
+      {
+        assert(datasize == sizeof(long long int));
+        for(int i=0; i<ep_rank_loc; i++)
+          reduce_max<long long int>(static_cast<long long int*>(comm->my_buffer->void_buffer[i]), static_cast<long long int*>(recvbuf), count);    
+      }
+
+      else 
+      {
+        printf("datatype Error in ep_exscan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
+    }
+
+    else if(op == MPI_MIN)
     {
       if(datatype == MPI_INT )
@@ -219 +241 @@
       }
 
-      else printf("datatype Error\n");
+      else if(datatype == MPI_LONG_LONG_INT )
+      {
+        assert(datasize == sizeof(long long int));
+        for(int i=0; i<ep_rank_loc; i++)
+          reduce_min<long long int>(static_cast<long long int*>(comm->my_buffer->void_buffer[i]), static_cast<long long int*>(recvbuf), count);    
+      }
+
+      else 
+      {
+        printf("datatype Error in ep_exscan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
+    }
+    
+    else
+    {
+      printf("op type Error in ep_exscan : MPI_MAX, MPI_MIN, MPI_SUM\n");
+      MPI_Abort(comm, 0);
     }
 
@@ -231 +270 @@
     if(comm->is_intercomm) return MPI_Exscan_intercomm(sendbuf, recvbuf, count, datatype, op, comm);
     
-    valid_type(datatype);
+    assert(valid_type(datatype));
+    assert(valid_op(op));
 
     int ep_rank = comm->ep_comm_ptr->size_rank_info[0].first;