Changeset 2291 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp

Timestamp:

02/01/22 15:28:48 (2 years ago)

Author:

ymipsl

Message:

Improve reduction transformation

• make the difference between reduction over geometry or reduction between process.

• geometrical reduction :

domain -> axis
axis -> scalar
domain -> scalar

• reduction across processes for redondant geometrical cell :

axis -> axis
scalar -> scalar

Reduction can be local (only for the geometrical cell owned by current process) or global, using the "local" attribute (bool) over the reduction.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_remote_connector.cpp (modified) (3 diffs)

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

@@ -114 +114 @@
   *         some redondant ranks can be removed from the elements_ map.
   */
-  void CGridRemoteConnector::computeConnector(void)
-  {
-    computeViewDistribution() ;
-    computeConnectorMethods() ;
-    computeRedondantRanks() ; 
-    for(auto& rank : rankToRemove_)
-      for(auto& element : elements_) element.erase(rank) ;
-  }
+  void CGridRemoteConnector::computeConnector(bool eliminateRedundant)
+  {
+    if (eliminateRedundant)
+    {
+      computeViewDistribution() ;
+      computeConnectorMethods() ;
+      computeRedondantRanks() ; 
+      for(auto& rank : rankToRemove_)
+        for(auto& element : elements_) element.erase(rank) ;
+    }
+    else
+    {
+       computeViewDistribution() ;
+       computeConnectorRedundant() ;
+    }
+  }
+
+/**
+  * \brief Compute the connector, i.e. compute the \b elements_ attribute. 
+  * \detail In this routine we don't eliminate redundant cells as it it performed in 
+  *         computeConnectorMethods. It can be usefull to perform reduce operation over processes.
+            In future, some optimisation could be done considering full redondance of the 
+            source view or the destination view.
+  */
+  void CGridRemoteConnector::computeConnectorRedundant(void)
+  {
+    vector<shared_ptr<CLocalView>> srcView ;
+    vector<shared_ptr<CDistributedView>> dstView ;
+    vector<int> indElements ;
+    elements_.resize(srcView_.size()) ;
+    
+    bool srcViewsNonDistributed=true ; // not usefull now but later for optimization
+    for(int i=0;i<srcView_.size();i++) srcViewsNonDistributed = srcViewsNonDistributed && !isSrcViewDistributed_[i]  ;
+    
+    bool dstViewsNonDistributed=true ;  // not usefull now but later for optimization
+    for(int i=0;i<dstView_.size();i++) dstViewsNonDistributed = dstViewsNonDistributed && !isDstViewDistributed_[i] ;
+    
+    for(int i=0;i<srcView_.size();i++) 
+    {
+      srcView.push_back(srcView_[i]) ;
+      dstView.push_back(dstView_[i]) ;
+      indElements.push_back(i) ;
+    }
+
+    computeGenericMethod(srcView, dstView, indElements) ;
+    
+    map<int,bool> ranks ;  
+    for(auto& it : elements_[indElements[0]]) 
+    {
+      if (it.second.numElements()==0) ranks[it.first] = false ;
+      else  ranks[it.first] = true ;
+    }
+   
+  }
+
+
 /**
   * \brief Compute the connector, i.e. compute the \b elements_ attribute. 
@@ -426 +474 @@
   }
 
-  
+
  /**
   * \brief Generic method the compute the grid remote connector. Only distributed elements are specifed in the source view and remote view. 
@@ -650 +698 @@
     }
   }
-
+  
 }