Changeset 5861 for CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/server.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/server.cpp (modified) (1 diff)

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

@@ -352 +352 @@
         MPI_Comm_rank(CXios::globalComm,&globalRank);
 
+// (1.5) check ensemble management
+        vector<string> baseOasisCodeId(oasisCodeId.size()) ;
+        vector<int> ensembleSize(oasisCodeId.size()) ;
+        vector<bool> ensembleManagement(oasisCodeId.size()) ;
+        
+        for(int i=0 ; i<oasisCodeId.size() ;i++)
+        {
+          vector<string> splittedOasisCodeId = splitRegex(oasisCodeId[i],"\\s*:\\s*") ;
+          baseOasisCodeId[i]=splittedOasisCodeId[0] ;
+          if (splittedOasisCodeId.size()==1) 
+          {
+            ensembleManagement[i]=false ;
+            ensembleSize[i]=1 ;
+          }
+          else if (splittedOasisCodeId.size()==2)
+          {
+            
+            try 
+            { 
+              ensembleSize[i] = stoi(splittedOasisCodeId[1]) ;
+            }
+            catch(...) 
+            { 
+              ERROR("void CServer::initialize(void)",<<"OasisCodeId is badly formed "<<oasisCodeId[i]) ;
+            }
+            
+            ensembleManagement[i] = true ;
+          }
+          else ERROR("void CServer::initialize(void)",<<"OasisCodeId is badly formed "<<oasisCodeId[i]) ;
+        }
+
 //      (2) Create interComms with models
-        for(it=oasisCodeId.begin();it!=oasisCodeId.end();it++)
-        {
-          oasis_get_intercomm(newComm,*it) ;
+        for(int i=0; i<baseOasisCodeId.size();i++)
+        {
+          if (ensembleManagement[i]==false) oasis_get_intercomm(newComm,baseOasisCodeId[i]) ;
+          else
+          {
+            vector<string> intraCommStr(ensembleSize[i]+1) ;
+            vector<int>    rootRanks ;
+            for(int j=0;j<ensembleSize[i];j++) intraCommStr[j]=baseOasisCodeId[i]+":"+std::to_string(j) ;
+            intraCommStr[ensembleSize[i]] = CXios::xiosCodeId ;
+            oasis_get_multi_intracomm(localComm, intraCommStr, rootRanks) ;
+   
+            int myColor= 1 ; // 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[0],10,&newComm) ;
+          }
+          
           if ( serverLevel == 0 || serverLevel == 1)
           {