Changeset 2589 for XIOS3/trunk/src/manager/server_context.cpp

Timestamp:

10/06/23 11:32:05 (8 months ago)

Author:

jderouillat

Message:

Specify the usage of the xios namespace to overload the MPI funtions

File:

• XIOS3/trunk/src/manager/server_context.cpp (modified) (5 diffs)

XIOS3/trunk/src/manager/server_context.cpp

@@ -23 +23 @@
    int localRank, globalRank, commSize ;
 
-    MPI_Comm_dup(contextComm, &contextComm_) ;
+    xios::MPI_Comm_dup(contextComm, &contextComm_) ;
     CXios::getMpiGarbageCollector().registerCommunicator(contextComm_) ;
     xiosComm_=CXios::getXiosComm() ;
@@ -104 +104 @@
     {
       MPI_Comm newInterCommClient, newInterCommServer ;
-      MPI_Comm_dup(contextComm_,&newInterCommClient) ;
-      MPI_Comm_dup(contextComm_,&newInterCommServer) ;
+      xios::MPI_Comm_dup(contextComm_,&newInterCommClient) ;
+      xios::MPI_Comm_dup(contextComm_,&newInterCommServer) ;
       overlapedComm_[name_]=tuple<bool, MPI_Comm, MPI_Comm>(false, newInterCommClient, newInterCommServer) ;
       MPI_Barrier(contextComm_) ;
@@ -129 +129 @@
       if (nOverlap==0)
       { 
-        MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interCommClient) ;
+        xios::MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interCommClient) ;
         CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
-        MPI_Comm_dup(interCommClient, &interCommServer) ;
+        xios::MPI_Comm_dup(interCommClient, &interCommServer) ;
         CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
-        MPI_Comm_free(&newInterCommClient) ;
-        MPI_Comm_free(&newInterCommServer) ;
+        xios::MPI_Comm_free(&newInterCommClient) ;
+        xios::MPI_Comm_free(&newInterCommServer) ;
       }
       else
@@ -320 +320 @@
     { 
       info(10)<<"CServerContext::createIntercomm : No overlap ==> context in server mode"<<endl ;
-      MPI_Intercomm_create(contextComm_, 0, xiosComm_, remoteLeader, 3141, &interCommServer) ;
+      xios::MPI_Intercomm_create(contextComm_, 0, xiosComm_, remoteLeader, 3141, &interCommServer) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
-      MPI_Comm_dup(interCommServer,&interCommClient) ;
+      xios::MPI_Comm_dup(interCommServer,&interCommClient) ;
       CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
       context_ -> createClientInterComm(interCommClient,interCommServer) ;
@@ -339 +339 @@
     //delete winNotify_ ;
     //winNotify_=nullptr ;
-    //MPI_Comm_free(&contextComm_) ;
+    //xios::MPI_Comm_free(&contextComm_) ;
     // don't forget intercomm -> later
   }