Changeset 5861 for CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/client.cpp

Timestamp:

06/24/21 11:14:28 (3 years ago)

Author:

ymipsl

Message:

• Adapt XIOS sources to manage ensemble runs, using new version of oasis

YM

File:

• CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/client.cpp (modified) (3 diffs)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/client.cpp

@@ -42 +42 @@
       else is_MPI_Initialized=false ;
       int rank ;
+      bool ensembleManagement ;
+      int ensembleSize ;
 
 // don't use OASIS
@@ -134 +136 @@
       else
       {
+
+        // manage ensemble with oasis
+        // code id is splitted follow the base code Id and the num number using the ":" separator
+        // codeId == baseCodeId:member
+        // member must integer convertible
+        vector<string> splittedCodeId=splitRegex(codeId,"\\s*:\\s*") ;
+        if (splittedCodeId.size()>2) ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)",
+                                            <<"CodeId is badly formed "<<codeId) ;
+        string baseCodeId=splittedCodeId[0] ;
+        int member ;
+        if (splittedCodeId.size()==2)
+        {
+          try
+          {
+            member = stoi(splittedCodeId[1]) ;
+          } 
+          catch(...)
+          {
+            ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)",
+                                            <<"CodeId is badly formed "<<codeId) ;
+          }
+          ensembleManagement=true ;
+        }
+        else ensembleManagement=false ;
+
+        string codesId=CXios::getin<string>("oasis_codes_id") ;
+        vector<string> oasisCodesId=splitRegex(codesId,"\\s*,\\s*") ;
+        for(auto& oasisCodeId : oasisCodesId)
+        {
+          info(10)<<"oasisCodeId "<<oasisCodeId<<endl ;
+          vector<string> splittedOasisCodeId = splitRegex(oasisCodeId,"\\s*:\\s*") ;
+          string baseOasisCodeId=splittedOasisCodeId[0] ;
+          info(10)<<"baseOasisCodeId "<<baseOasisCodeId<<"  baseCodeId "<<baseCodeId<<endl ;
+          if (baseOasisCodeId==baseCodeId)
+          {
+            if (splittedOasisCodeId.size()==2)
+            {
+              try
+              {
+                ensembleSize = stoi(splittedOasisCodeId[1]) ;
+                info(10)<<"ensembleSize "<<ensembleSize<<endl ;
+              } 
+              catch(...)
+              {
+                ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)",
+                                                <<"CodeId is badly formed "<<codeId) ;
+              }
+              if (ensembleManagement==false)  ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)",
+                                                <<"inconsistancy for ensemble management between local codeId and OASIS codes Id  : "
+                                                <<codeId<<"  "<< codesId); 
+            }
+            else if (ensembleManagement==true)  ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)",
+                                                <<"inconsistancy for ensemble management between local codeId and OASIS codes Id "
+                                                <<codeId<<"  "<< codesId); 
+          }
+        }
+        
+        
         // localComm isn't given
         if (localComm == MPI_COMM_NULL)
         {
           if (!is_MPI_Initialized) oasis_init(codeId) ;
-          oasis_get_localcomm(localComm) ;
+          if(ensembleManagement) 
+          {
+            vector<string> intraCommStr(ensembleSize) ;
+            vector<int>    rootRanks ;
+            for(int i=0;i<ensembleSize;i++) intraCommStr[i]=baseCodeId+":"+std::to_string(i) ;
+            oasis_get_multi_intracomm(localComm, intraCommStr, rootRanks) ;
+          }
+          else oasis_get_localcomm(localComm) ;
         }
         MPI_Comm_dup(localComm,&intraComm) ;
@@ -149 +216 @@
           MPI_Status status ;
           MPI_Comm_rank(intraComm,&rank_) ;
-
-          oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
+          
+          if(ensembleManagement) 
+          {
+            vector<string> intraCommStr(ensembleSize+1) ;
+            vector<int>    rootRanks ;
+            for(int i=0;i<ensembleSize;i++) intraCommStr[i]=baseCodeId+":"+std::to_string(i) ;
+            intraCommStr[ensembleSize] = CXios::xiosCodeId ;
+            
+            oasis_get_multi_intracomm(localComm, intraCommStr, rootRanks) ;
+   
+            int myColor= 0 ; // 0:client 1:server
+            int myrank ;
+            MPI_Comm splittedComm ;
+            MPI_Comm_rank(localComm,&myrank) ;
+            MPI_Comm_split(localComm,myColor,myrank, &splittedComm) ;
+            MPI_Intercomm_create(splittedComm,0,localComm,rootRanks[ensembleSize],10,&interComm) ;
+          
+          }
+          else oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
           if (rank_==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;
           MPI_Bcast(&serverLeader,1,MPI_INT,0,intraComm) ;