Changeset 1316 for XIOS/dev

Timestamp:

10/25/17 19:07:41 (7 years ago)

Author:

ymipsl

Message:

Modify registry configuration. The name of the context added automatically to the key will the same for client than for servers.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• context.cpp (modified) (3 diffs)
• file.cpp (modified) (2 diffs)

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

@@ -251 +251 @@
      hasClient = true;
      MPI_Comm intraCommServer, interCommServer;
+     
 
      if (CServer::serverLevel != 1)
@@ -268 +269 @@
          comms.push_back(interCommServer);
        }
+/* for registry take the id of client context */
+/* for servers, supress the _server_ from id  */
+       string contextRegistryId=getId() ;
+       size_t pos=contextRegistryId.find("_server_") ;
+       if (pos!=std::string::npos)  contextRegistryId=contextRegistryId.substr(0,pos) ;
+
        registryIn=new CRegistry(intraComm);
-       registryIn->setPath(getId()) ;
+       registryIn->setPath(contextRegistryId) ;
        if (client->clientRank==0) registryIn->fromFile("xios_registry.bin") ;
        registryIn->bcastRegistry() ;
        registryOut=new CRegistry(intraComm) ;
-       registryOut->setPath(getId()) ;
+       
+       registryOut->setPath(contextRegistryId) ;
 
        server = new CContextServer(this, intraCommServer, interCommServer);
@@ -350 +358 @@
      server = new CContextServer(this,intraComm,interComm);
 
+/* for registry take the id of client context */
+/* for servers, supress the _server_ from id  */
+     string contextRegistryId=getId() ;
+     size_t pos=contextRegistryId.find("_server_") ;
+     if (pos!=std::string::npos)  contextRegistryId=contextRegistryId.substr(0,pos) ;
+       
      registryIn=new CRegistry(intraComm);
-     registryIn->setPath(getId()) ;
+     registryIn->setPath(contextRegistryId) ;
      if (server->intraCommRank==0) registryIn->fromFile("xios_registry.bin") ;
      registryIn->bcastRegistry() ;
      registryOut=new CRegistry(intraComm) ;
-     registryOut->setPath(getId()) ;
+     registryOut->setPath(contextRegistryId) ;
 
      MPI_Comm intraCommClient, interCommClient;

XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

@@ -218 +218 @@
       if (!split_freq.isEmpty())
       {
-        StdString keySuffix("CContext_"+CContext::getCurrent()->getId()+"::CFile_"+getFileOutputName()+"::") ; 
+        StdString keySuffix("CFile::"+getFileOutputName()+"::") ; 
         if (context->registryIn->foundKey(keySuffix+"splitStart") && context->registryIn->foundKey(keySuffix+"splitEnd"))
         {
@@ -494 +494 @@
            oss << lastPart ;
 
-           StdString keySuffix("CContext_"+CContext::getCurrent()->getId()+"::CFile_"+getFileOutputName()+"::") ; 
+           StdString keySuffix("CFile::"+getFileOutputName()+"::") ; 
            context->registryOut->setKey(keySuffix+"splitStart", lastSplit);
            context->registryOut->setKey(keySuffix+"splitEnd",   splitEnd);