Changeset 1661 for XIOS/dev/dev_trunk_omp/src/node/context.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/context.cpp (modified) (6 diffs)

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

@@ -287 +287 @@
        else
        {
-         ep_lib::MPI_Comm_dup(intraComm, &intraCommServer);
+         MPI_Comm_dup(intraComm, &intraCommServer);
          comms.push_back(intraCommServer);
-         ep_lib::MPI_Comm_dup(interComm, &interCommServer);
+         MPI_Comm_dup(interComm, &interCommServer);
          comms.push_back(interCommServer);
        }
@@ -312 +312 @@
      {
        clientPrimServer.push_back(new CContextClient(this, intraComm, interComm));
-       ep_lib::MPI_Comm_dup(intraComm, &intraCommServer);
+       MPI_Comm_dup(intraComm, &intraCommServer);
        comms.push_back(intraCommServer);
-       ep_lib::MPI_Comm_dup(interComm, &interCommServer);
+       MPI_Comm_dup(interComm, &interCommServer);
        comms.push_back(interCommServer);
        serverPrimServer.push_back(new CContextServer(this, intraCommServer, interCommServer));
@@ -413 +413 @@
      else
      {
-       ep_lib::MPI_Comm_dup(intraComm, &intraCommClient);
+       MPI_Comm_dup(intraComm, &intraCommClient);
        comms.push_back(intraCommClient);
-       ep_lib::MPI_Comm_dup(interComm, &interCommClient);
+       MPI_Comm_dup(interComm, &interCommClient);
        comms.push_back(interCommClient);
      }
@@ -506 +506 @@
          //! Free internally allocated communicators
          for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           ep_lib::MPI_Comm_free(&(*it));
+           MPI_Comm_free(&(*it));
          comms.clear();
 
@@ -554 +554 @@
          //! Free internally allocated communicators
          for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           ep_lib::MPI_Comm_free(&(*it));
+           MPI_Comm_free(&(*it));
          comms.clear();
 
@@ -573 +573 @@
    {
      for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-       ep_lib::MPI_Comm_free(&(*it));
+       MPI_Comm_free(&(*it));
      comms.clear();
    }