Changeset 862 for XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

Timestamp:

06/09/16 11:32:27 (8 years ago)

Author:

mhnguyen

Message:

Chaning the way to process transformation to improve the performance.
Instead of exchanging global index and weights on full GRID, each process only
sends and receives the global index and weights on each ELEMENT, which can reduce
the message size of DHT.

+) Domain and axis now have their own exchange function to transfer global index and weight
+) Generic transformation now plays the role of "synthesizer" for all elements
+) Grid transformation now plays the role of transformation mapping, e.x: exchange final global index and weight
among processes.

Test
+) On Curie
+) Pass on all basic tests
+) Dynamic interpolation on axis hasn't been tested (and it seems to need more change to make it rework)

File:

• XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp (modified) (4 diffs)

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -15 +15 @@
 
 namespace xios {
+  class CGrid;
+  class CDomain;
+  class CAxis;
+
   /*!
   \class CGenericAlgorithmTransformation
@@ -27 +31 @@
   // Mapping between global index map of DESTINATION and its local index with pair of global index of SOURCE and weights
   typedef boost::unordered_map<size_t, DestinationGlobalIndex> DestinationIndexMap;
+  //
+  typedef boost::unordered_map<int, boost::unordered_map<size_t, std::vector<std::pair<size_t,double> > > > SourceDestinationIndexMap;
 
 protected:
   typedef boost::unordered_map<size_t,int> GlobalLocalMap;
+protected:
+  typedef boost::unordered_map<int, std::vector<int> > TransformationIndexMap;
+  typedef boost::unordered_map<int, std::vector<double> > TransformationWeightMap;
+  typedef boost::unordered_map<int, std::vector<int> > TransformationPositionMap;
 
 public:
@@ -36 +46 @@
   virtual ~CGenericAlgorithmTransformation() {}
 
+//  void computeGlobalSourceIndex(int elementPositionInGrid,
+//                                const std::vector<int>& gridDestGlobalDim,
+//                                const std::vector<int>& gridSrcGlobalDim,
+//                                const GlobalLocalMap& globalLocalIndexGridDestSendToServer,
+//                                DestinationIndexMap& globaIndexWeightFromDestToSource);
+
   void computeGlobalSourceIndex(int elementPositionInGrid,
-                                const std::vector<int>& gridDestGlobalDim,
-                                const std::vector<int>& gridSrcGlobalDim,
-                                const GlobalLocalMap& globalLocalIndexGridDestSendToServer,
-                                DestinationIndexMap& globaIndexWeightFromDestToSource);
+                               CGrid* gridSrc,
+                               CGrid* gridDst,
+                               SourceDestinationIndexMap& globaIndexWeightFromSrcToDst);
 
   std::vector<StdString> getIdAuxInputs();
@@ -72 +87 @@
   virtual void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >&) = 0;
 
+  virtual void computeExchangeGlobalIndex(const CArray<size_t,1>& globalElementIndex,
+                                          boost::unordered_map<int,std::vector<size_t> >& globalElementIndexOnProc) = 0;
+
+  void computeGlobalGridIndexMapping(int elementPositionInGrid,
+                                     const std::vector<int>& srcRank,
+                                     boost::unordered_map<int, std::vector<std::pair<int,double> > >& src2DstMap,
+                                     CGrid* gridDst,
+                                     CGrid* gridSrc,
+                                     std::vector<boost::unordered_map<int,std::vector<size_t> > >& globalElementIndexOnProc,
+                                     SourceDestinationIndexMap& globaIndexWeightFromSrcToDst);
+
+  void computeExchangeDomainIndex(CDomain* domainDst,
+                                  CDomain* domainSrc,
+                                  CArray<size_t,1>& destGlobalIndexPositionInGrid,
+                                  boost::unordered_map<int,std::vector<size_t> >& globalDomainIndexOnProc);
+
+  void computeExchangeAxisIndex(CAxis* axisDst,
+                                CAxis* axisSrc,
+                                CArray<size_t,1>& destGlobalIndexPositionInGrid,
+                                boost::unordered_map<int,std::vector<size_t> >& globalAxisIndexOnProc);
+
 protected:
-  typedef boost::unordered_map<int, std::vector<int> > TransformationIndexMap;
-  typedef boost::unordered_map<int, std::vector<double> > TransformationWeightMap;
-  typedef boost::unordered_map<int, std::vector<int> > TransformationPositionMap;
-
   //! Map between global index of destination element and source element
   std::vector<TransformationIndexMap> transformationMapping_;