Changeset 1999 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution

Timestamp:

01/03/21 18:00:43 (3 years ago)

Author:

ymipsl

Message:

Adapt transformation algorithm to new infrastructure (on going...)

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution

Files:

• element.hpp (modified) (1 diff)
• grid_local_view.hpp (modified) (1 diff)
• grid_remote_connector.cpp (modified) (1 diff)
• grid_remote_connector.hpp (modified) (1 diff)
• grid_transform_connector.cpp (added)
• grid_transform_connector.hpp (added)
• reduce_transform_connector.cpp (added)
• reduce_transform_connector.hpp (added)
• transfer_transform_connector.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/element.hpp

@@ -32 +32 @@
     void recvFromClient(CEventServer& event) ;
     size_t getGlobalSize(void) { return globalSize_;}
-
+    std::map<int, CArray<size_t,1>>& getGlobalIndex(void) { return globalIndex_;}
+    
     CDistributedView* getView(CElementView::type type) 
     { 

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_local_view.hpp

@@ -19 +19 @@
       CGridLocalView(CGridLocalElements* parent, CElementView::type type) ;
       std::vector<CLocalView*>& getViews(void) {return views_ ;}
+      CLocalView* getView(int i) {return views_[i] ;}
       int getSize() { return size_ ;}
   } ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp

@@ -11 +11 @@
                        : srcView_(srcView), dstView_(dstView), localComm_(localComm), remoteSize_(remoteSize) 
   {}
+
+  CGridRemoteConnector::CGridRemoteConnector(vector<CLocalView*>& srcView, vector<CLocalView*>& dstView, MPI_Comm localComm, int remoteSize) 
+                       : srcView_(srcView), localComm_(localComm), remoteSize_(remoteSize) 
+  {
+    for(auto& it : dstView) dstView_.push_back((CDistributedView*) it) ; 
+  }
 
   void CGridRemoteConnector::computeConnector(void)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.hpp

@@ -19 +19 @@
 
       CGridRemoteConnector(vector<CLocalView*>& srcView, vector<CDistributedView*>& dstView, MPI_Comm localComm, int remoteSize) ;
+      CGridRemoteConnector(vector<CLocalView*>& srcView, vector<CLocalView*>& dstView, MPI_Comm localComm, int remoteSize) ;
       void computeConnector(void) ;
       void computeGenericMethod(void) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/transfer_transform_connector.hpp

@@ -47 +47 @@
           if (mask_[i])
           {
-            for(int l=0; l<sizeT; l++) out[l] += in[connector_[k]*sizeT+l] ;
+            for(int l=0; l<sizeT; l++) out[l] = in[connector_[k]*sizeT+l] ;
             k++ ;
           }