Changeset 2335 for XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp

Timestamp:

06/15/22 15:20:29 (2 years ago)

Author:

jderouillat

Message:

Introduced a new service (named defaultServicesId which contains all gatherers and all IO servers) to manage oasis_enddef through the different levels of servers. OASIS integration is moved in a dedicated virtual class CThirdPartyDriver whose an instance is owned by CServer.

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp (modified) (6 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp

@@ -48 +48 @@
     CEventScheduler* CServer::eventScheduler = 0;
     CServersRessource* CServer::serversRessource_=nullptr ;
+    CThirdPartyDriver* CServer::driver_ =nullptr ;
 
        
@@ -97 +98 @@
       else // using OASIS
       {
-        if (!is_MPI_Initialized) oasis_init(CXios::xiosCodeId);
-
-        oasis_get_localcomm(serverComm);
+        if (!is_MPI_Initialized) driver_ = new CThirdPartyDriver();
+
+        driver_->getComponentCommunicator( serverComm );
       }
       MPI_Comm_dup(serverComm, &intraComm_);
@@ -200 +201 @@
           servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultGathererId, CServicesManager::GATHERER, nprocsGatherer, 1) ;
           servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultServerId, CServicesManager::OUT_SERVER, nprocsServer, nbPoolsServer2) ;
+
+
         }
+        servicesManager->createServices(CXios::defaultPoolId,  CXios::defaultServicesId, CServicesManager::ALL_SERVICES, nbRessources, 1) ;
       }
       CTimer::get("XIOS initialize").suspend() ;
@@ -381 +385 @@
          boost::hash<string> hashString;
          size_t hashId = hashString("oasis_enddef");
-         if (CXios::getPoolRessource()->getService(CXios::defaultServerId,0)->getEventScheduler()->queryEvent(0,hashId))
+         if (CXios::getPoolRessource()->getService(CXios::defaultServicesId,0)->getEventScheduler()->queryEvent(0,hashId))
          {
-           CXios::getPoolRessource()->getService(CXios::defaultServerId,0)->getEventScheduler()->popEvent() ;
-           oasis_enddef() ;
+           CXios::getPoolRessource()->getService(CXios::defaultServicesId,0)->getEventScheduler()->popEvent() ;
+           driver_->endSynchronizedDefinition() ;
            eventSent=false ;
          }
@@ -397 +401 @@
            boost::hash<string> hashString;
            size_t hashId = hashString("oasis_enddef");
-           CXios::getPoolRessource()->getService(CXios::defaultServerId,0)->getEventScheduler()->registerEvent(0,hashId);
+           CXios::getPoolRessource()->getService(CXios::defaultServicesId,0)->getEventScheduler()->registerEvent(0,hashId);
            eventSent=true ;
        }
@@ -427 +431 @@
       if (!is_MPI_Initialized)
       {
-        if (CXios::usingOasis) oasis_finalize();
+        if (CXios::usingOasis) delete driver_;
         else MPI_Finalize() ;
       }