Changeset 655 for XIOS/trunk/src/client.cpp

Timestamp:

07/24/15 16:40:07 (9 years ago)

Author:

rlacroix

Message:

Properly release all MPI resources.

File:

• XIOS/trunk/src/client.cpp (modified) (5 diffs)

XIOS/trunk/src/client.cpp

@@ -17 +17 @@
     MPI_Comm CClient::intraComm ;
     MPI_Comm CClient::interComm ;
+    std::list<MPI_Comm> CClient::contextInterComms;
     int CClient::serverLeader ;
     bool CClient::is_MPI_Initialized ;
@@ -128 +129 @@
         {
           if (!is_MPI_Initialized) oasis_init(codeId) ;
-          oasis_get_localcomm(intraComm) ;
-        }
-        else MPI_Comm_dup(localComm,&intraComm) ;
+          oasis_get_localcomm(localComm) ;
+        }
+        MPI_Comm_dup(localComm,&intraComm) ;
+
         CTimer::get("XIOS").resume() ;
         CTimer::get("XIOS init").resume() ;
@@ -191 +193 @@
 
         context->initClient(contextComm,contextInterComm) ;
+
+        contextInterComms.push_back(contextInterComm);
+        MPI_Comm_free(&inter);
       }
       else
@@ -206 +211 @@
         // Finally, we should return current context to context client
         CContext::setCurrent(id);
-//        context->initServer(contextComm,contextInterComm) ;
+
+        contextInterComms.push_back(contextInterComm);
       }
     }
@@ -223 +229 @@
       }
 
-     CTimer::get("XIOS finalize").suspend() ;
-     CTimer::get("XIOS").suspend() ;
+      for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
+        MPI_Comm_free(&(*it));
+      MPI_Comm_free(&interComm);
+      MPI_Comm_free(&intraComm);
+
+      CTimer::get("XIOS finalize").suspend() ;
+      CTimer::get("XIOS").suspend() ;
 
       if (!is_MPI_Initialized)