Changeset 2335

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.

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• client.cpp (modified) (2 diffs)
• cxios.cpp (modified) (1 diff)
• cxios.hpp (modified) (1 diff)
• manager/services_manager.hpp (modified) (1 diff)
• server.cpp (modified) (6 diffs)
• server.hpp (modified) (3 diffs)

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

@@ -106 +106 @@
           MPI_Comm_split(globalComm, color, commRank, &clientComm) ;
         }
-        else // using oasis to split communicator
-        {
-          if (!is_MPI_Initialized) oasis_init(codeId) ;
-          oasis_get_localcomm(clientComm) ;
+        else
+        {
+          ERROR("void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)", <<"OASIS usage is set. In these conditions, XIOS initialization needs the local_comm created by OASIS."<<endl) ;
         }
       }
@@ -507 +506 @@
       if (!is_MPI_Initialized)
       {
-        if (CXios::usingOasis) oasis_finalize();
-        else MPI_Finalize() ;
+        if (!CXios::usingOasis) MPI_Finalize() ;
       }
       

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

@@ -27 +27 @@
   const string CXios::defaultServerId="default_server_id" ;
   const string CXios::defaultGathererId="default_gatherer_id" ;
+  const string CXios::defaultServicesId="default_services_id" ;
   
   bool CXios::xiosStack = true;

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.hpp

@@ -71 +71 @@
      static const string defaultServerId ;
      static const string defaultGathererId ;
-
+     static const string defaultServicesId ;
 
      static CRegistryManager* registryManager_ ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services_manager.hpp

@@ -23 +23 @@
     static const int IO_SERVER=2 ;
     static const int OUT_SERVER=3 ;
+    static const int ALL_SERVICES=4 ;
 
     public:

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() ;
       }

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

@@ -7 +7 @@
 #include "mpi.hpp"
 #include "event_scheduler.hpp"
+#include "oasis_cinterface.hpp"
 
 namespace xios
@@ -12 +13 @@
     class CServersRessource ;
 
+    class CThirdPartyDriver
+    {
+      public:
+        CThirdPartyDriver()
+        {
+          oasis_init(CXios::xiosCodeId);
+        };
+        virtual ~CThirdPartyDriver()
+        {
+          oasis_finalize();
+        };
+        virtual void endSynchronizedDefinition()
+        {
+          oasis_enddef();
+        };
+        virtual void getComponentCommunicator(MPI_Comm &intraComm)
+        {
+          oasis_get_localcomm(intraComm);
+        };
+    };
+  
     class CServer
     {
@@ -80 +102 @@
         static StdOFStream m_errorStream;
         static CServersRessource* serversRessource_  ;
+
+        static CThirdPartyDriver* driver_;
     };
 }