Changeset 1665 for XIOS/dev/dev_trunk_omp/src/server.cpp

Timestamp:

05/20/19 13:14:51 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Add option --omp to enable multithreading.

File:

• XIOS/dev/dev_trunk_omp/src/server.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/src/server.cpp

@@ -666 +666 @@
          if (flag==true)
          {
-           #ifdef _usingMPI
+           
+           #ifdef _usingEP
+           rank=status.ep_src;
+           #else
            rank=status.MPI_SOURCE ;
-           #elif _usingEP
-           rank=status.ep_src;
            #endif
            MPI_Get_count(&status,MPI_CHAR,&count) ;
@@ -684 +685 @@
          if (flag==true)
          {
-           #ifdef _usingMPI
+           
+           #ifdef _usingEP
+           rank=status.ep_src;
+           #else
            rank=status.MPI_SOURCE ;
-           #elif _usingEP
-           rank=status.ep_src;
            #endif
            MPI_Get_count(&status,MPI_CHAR,&count) ;