Changeset 1540 for XIOS/dev/branch_openmp/extern/ep_dev/ep_scan.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_scan.cpp (modified) (6 diffs)

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

@@ -98 +98 @@
           reduce_sum<unsigned long>(static_cast<unsigned long*>(const_cast<void*>(sendbuf)), static_cast<unsigned long*>(recvbuf), count);    
         }
-            
-        else printf("datatype Error\n");
+        
+        else if(datatype == MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long int));
+          reduce_sum<long long int>(static_cast<long long int*>(const_cast<void*>(sendbuf)), static_cast<long long int*>(recvbuf), count);    
+        }
+            
+        else 
+        {
+          printf("datatype Error in ep_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
       }
 
@@ -140 +150 @@
         } 
             
-        else printf("datatype Error\n");
-      }
-
-      else //(op == MPI_MIN)
+        else if(datatype == MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long int));
+          reduce_max<long long int>(static_cast<long long int*>(const_cast<void*>(sendbuf)), static_cast<long long int*>(recvbuf), count);    
+        }
+            
+        else 
+        {
+          printf("datatype Error in ep_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
+      }
+
+      else if(op == MPI_MIN)
       {
         if(datatype == MPI_INT )
@@ -181 +201 @@
         }
             
-        else printf("datatype Error\n");
+        else if(datatype == MPI_LONG_LONG_INT)
+        {
+          assert(datasize == sizeof(long long int));
+          reduce_min<long long int>(static_cast<long long int*>(const_cast<void*>(sendbuf)), static_cast<long long int*>(recvbuf), count);    
+        }
+            
+        else 
+        {
+          printf("datatype Error in ep_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+          MPI_Abort(comm, 0);
+        }
+      }
+      
+      else
+      {
+        printf("op type Error in ep_scan : MPI_MAX, MPI_MIN, MPI_SUM\n");
+        MPI_Abort(comm, 0);
       }
 
@@ -243 +279 @@
           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=1; i<ep_rank_loc+1; 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_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
 
       
@@ -293 +340 @@
       }
      
-      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=1; i<ep_rank_loc+1; 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_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
+
+    }
+
+    else if(op == MPI_MIN)
     {
       if(datatype == MPI_INT )
@@ -340 +399 @@
       }
 
-      else printf("datatype Error\n");
+      else if(datatype == MPI_LONG_LONG_INT )
+      {
+        assert(datasize == sizeof(long long int));
+        for(int i=1; i<ep_rank_loc+1; 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_scan : INT, FLOAT, DOUBLE, CHAR, LONG, UNSIGNED_LONG, LONG_LONG_INT\n");
+        MPI_Abort(comm, 0);
+      }
+
+    }
+    
+    else
+    {
+      printf("op type Error in ep_scan : MPI_MAX, MPI_MIN, MPI_SUM\n");
+      MPI_Abort(comm, 0);
     }