Changeset 1661 for XIOS/dev/dev_trunk_omp/src/node/file.cpp

Timestamp:

05/15/19 17:19:08 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Test (test_complete, test_remap) on ADA with IntelMPI and _usingEP/_usingMPI as switch.

File:

• XIOS/dev/dev_trunk_omp/src/node/file.cpp (modified) (4 diffs)

XIOS/dev/dev_trunk_omp/src/node/file.cpp

@@ -307 +307 @@
 
       int color = allZoneEmpty ? 0 : 1;
-      ep_lib::MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);
-      if (allZoneEmpty) ep_lib::MPI_Comm_free(&fileComm);
+      MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);
+      if (allZoneEmpty) MPI_Comm_free(&fileComm);
     }
     CATCH_DUMP_ATTR
@@ -557 +557 @@
          {
             int commSize, commRank;
-            ep_lib::MPI_Comm_size(fileComm, &commSize);
-            ep_lib::MPI_Comm_rank(fileComm, &commRank);
+            MPI_Comm_size(fileComm, &commSize);
+            MPI_Comm_rank(fileComm, &commRank);
 
             if (server->intraCommSize > 1)
@@ -683 +683 @@
       {
         int commSize, commRank;
-        ep_lib::MPI_Comm_size(readComm, &commSize);
-        ep_lib::MPI_Comm_rank(readComm, &commRank);
+        MPI_Comm_size(readComm, &commSize);
+        MPI_Comm_rank(readComm, &commRank);
 
         if (server->intraCommSize > 1)
@@ -728 +728 @@
         isOpen = false;
        }
-      //if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm);
+     #ifdef _usingMPI 
+     if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm);
+     #endif
    }
    CATCH_DUMP_ATTR