Changeset 1878

Timestamp:

05/13/20 23:15:06 (4 years ago)

Author:

ymipsl

Message:

Coupling Branch.
Implementing a coupler scheduler, to impose order for intercommunicator creation between several coupling context.
Two way coupling is now working.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• cxios.cpp (modified) (3 diffs)
• cxios.hpp (modified) (3 diffs)
• manager/coupler_manager.cpp (added)
• manager/coupler_manager.hpp (added)
• manager/daemons_manager.cpp (modified) (2 diffs)
• node/context.cpp (modified) (1 diff)
• node/domain.cpp (modified) (1 diff)
• node/field.cpp (modified) (2 diffs)

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

@@ -55 +55 @@
   CServicesManager*   CXios::servicesManager_=nullptr ;
   CContextsManager*   CXios::contextsManager_=nullptr ;
+  CCouplerManager*    CXios::couplerManager_=nullptr ;
 
   //! Parse configuration file and create some objects from it
@@ -221 +222 @@
   }
 
+  void CXios::launchCouplerManager(bool isXiosServer)
+  {
+    couplerManager_ = new CCouplerManager(isXiosServer) ;
+  }
+
   void CXios::launchServicesManager(bool isXiosServer)
   {
@@ -240 +246 @@
   {
     delete ressourcesManager_;
+  }
+
+  void CXios::finalizeCouplerManager()
+  {
+    delete couplerManager_;
   }
 

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

@@ -9 +9 @@
 #include "contexts_manager.hpp"
 #include "daemons_manager.hpp"
+#include "coupler_manager.hpp"
 
 namespace xios
@@ -68 +69 @@
 
      static CRessourcesManager* ressourcesManager_ ;
+     static CCouplerManager* couplerManager_ ;
      static CServicesManager* servicesManager_ ;
      static CContextsManager* contextsManager_ ;
@@ -90 +92 @@
      static void launchDaemonsManager(bool isXiosServer) ;
      static void launchRessourcesManager(bool isXiosServer) ;
-     
+     static void launchCouplerManager(bool isXiosServer) ;
+    
      static void finalizeServicesManager() ;
      static void finalizeContextsManager() ;
      static void finalizeDaemonsManager() ;
      static void finalizeRessourcesManager() ;
+     static void finalizeCouplerManager() ;
 
      static CRessourcesManager* getRessourcesManager(void) { return ressourcesManager_ ;}
+     static CCouplerManager*    getCouplerManager(void) { return couplerManager_ ;}
      static CServicesManager*   getServicesManager(void) { return servicesManager_ ;}
      static CContextsManager*   getContextsManager(void) { return contextsManager_ ;}

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/daemons_manager.cpp

@@ -22 +22 @@
     CXios::launchServicesManager(isXiosServer) ;
     CXios::launchContextsManager(isXiosServer) ;
+    CXios::launchCouplerManager(isXiosServer) ;
+
     if (isXiosServer) CServer::launchServersRessource(splitComm) ;
     MPI_Comm_free(&splitComm) ;
@@ -29 +31 @@
   {
     CXios::finalizeContextsManager() ;
+    CXios::finalizeCouplerManager() ;
     CXios::finalizeServicesManager() ;
     CXios::finalizeRessourcesManager() ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -2446 +2446 @@
    TRY
    {
-      // juste for test now, in future need an scheduler to avoid dead-lock
-      for(auto it=enabledCouplerOut.begin();it!=enabledCouplerOut.end();++it)
-      {
-        (*it)->createInterCommunicator() ;
-      }
-
-      for(auto it=enabledCouplerIn.begin();it!=enabledCouplerIn.end();++it)
-      {
-        (*it)->createInterCommunicator() ;
-      }
+      int rank=this->getIntraCommRank() ;
+      map<string,list<CCouplerOut*>> listCouplerOut ;  
+      map<string,list<CCouplerIn*>> listCouplerIn ;  
+
+      for(auto couplerOut : enabledCouplerOut) listCouplerOut[couplerOut->getCouplingContextId()].push_back(couplerOut) ;
+      for(auto couplerIn : enabledCouplerIn) listCouplerIn[couplerIn->getCouplingContextId()].push_back(couplerIn) ;
+
+      CCouplerManager* couplerManager = CXios::getCouplerManager() ;
+      if (rank==0)
+      {
+        for(auto couplerOut : listCouplerOut) couplerManager->registerCoupling(this->getContextId(),couplerOut.first) ;
+        for(auto couplerIn : listCouplerIn) couplerManager->registerCoupling(couplerIn.first,this->getContextId()) ;
+      }
+
+      do
+      {
+        for(auto couplerOut : listCouplerOut) 
+        {
+          bool isNextCoupling ;
+          if (rank==0) isNextCoupling = couplerManager->isNextCoupling(this->getContextId(),couplerOut.first) ;
+          MPI_Bcast(&isNextCoupling,1,MPI_C_BOOL, 0, getIntraComm()) ; 
+          if (isNextCoupling) 
+          {
+            addCouplingChanel(couplerOut.first, true) ;
+            listCouplerOut.erase(couplerOut.first) ;
+            break ;
+          }            
+        }
+        for(auto couplerIn : listCouplerIn) 
+        {
+          bool isNextCoupling ;
+          if (rank==0) isNextCoupling = couplerManager->isNextCoupling(couplerIn.first,this->getContextId());
+          MPI_Bcast(&isNextCoupling,1,MPI_C_BOOL, 0, getIntraComm()) ; 
+          if (isNextCoupling) 
+          {
+            addCouplingChanel(couplerIn.first, false) ;
+            listCouplerIn.erase(couplerIn.first) ;
+            break ;
+          }           
+        }
+
+      } while (!listCouplerOut.empty() || !listCouplerIn.empty()) ;
+
    }
    CATCH_DUMP_ATTR

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

@@ -2862 +2862 @@
           {
             bounds_lat_1d.resize(nvertex, nbLatInd) ;
-            bounds_lon_1d = bounds_lonvalue ;
+            bounds_lat_1d = bounds_latvalue ;
           }
         }

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -580 +580 @@
       // for coupling, it would be after the first freq_op, because for now we don't have
       // restart mecanism to send the value at ts=0. It mus be changed in future
-      lastDataReceivedFromServer = context->getCalendar()->getInitDate()+freq_op;
+      lastDataReceivedFromServer = context->getCalendar()->getInitDate();
       wasDataAlreadyReceivedFromServer = true;
     }
@@ -659 +659 @@
     do
     {
-      const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + freq_op) : context->getCalendar()->getInitDate();
+      const CDate nextDataDue = (wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + freq_op) : context->getCalendar()->getInitDate()) + freq_offset;
       isDataLate = (nextDataDue <= currentDate);