Changeset 841 for XIOS/trunk/src/transformation/grid_transformation.hpp

Timestamp:

04/26/16 16:03:51 (8 years ago)

Author:

mhnguyen

Message:

Changing the way to create virtual grid during transformation.

+)Instead of establishing relation between source grid of current transformation and
the original source grid (source grid of the first transformation), each transformation
keeps its list of source grid and destination, which will be used in interpolation.
+) Clean some redundant codes

Test
+) All official tests pass
+) interpolation tests pass

File:

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

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -37 +37 @@
   typedef std::list<std::pair<int,std::pair<ETranformationType,int> > > ListAlgoType;
   typedef boost::unordered_map<size_t, std::vector<std::pair<int, std::pair<size_t,double> > > > DestinationIndexMap;
+  typedef std::map<int, CArray<int,1> > SendingIndexGridSourceMap;
+  typedef std::map<int,std::vector<std::vector<std::pair<int,double> > > > RecvIndexGridDestinationMap;
 
 public:
@@ -45 +47 @@
   void computeAll(const std::vector<CArray<double,1>* >& dataAuxInput=std::vector<CArray<double,1>* >(), Time timeStamp = 0);
 
-  const std::map<int, CArray<int,1> >& getLocalIndexToSendFromGridSource() const;
-  const std::map<int, std::vector<std::vector<std::pair<int,double> > > >& getLocalIndexToReceiveOnGridDest() const;
+  const std::list<SendingIndexGridSourceMap>& getLocalIndexToSendFromGridSource() const;
+  const std::list<RecvIndexGridDestinationMap>& getLocalIndexToReceiveOnGridDest() const;
+  const std::list<size_t>& getNbLocalIndexToReceiveOnGridDest() const;
+
   CGrid* getGridSource() { return originalGridSource_; }
   CGrid* getGridDestination() { return gridDestination_; }
@@ -64 +68 @@
   void selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, bool isDomainAlgo);
   void setUpGrid(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
-  void computeFinalTransformationMapping();
-  void computeTransformationFromOriginalGridSource(const DestinationIndexMap& globaIndexMapFromDestToSource);
-  void updateFinalGridDestination();
+//  void computeFinalTransformationMapping();
+//  void computeTransformationFromOriginalGridSource(const DestinationIndexMap& globaIndexMapFromDestToSource);
+  void computeTransformationMapping(const DestinationIndexMap& globalIndexWeightFromDestToSource);
+//  void updateFinalGridDestination();
   bool isSpecialTransformation(ETranformationType transType);
 
@@ -96 +101 @@
 
   //! Local index of data to send from grid source
-  std::map<int, CArray<int,1> > localIndexToSendFromGridSource_;
+  std::list<SendingIndexGridSourceMap> localIndexToSendFromGridSource_;
 
   //! Local index of data to receive on grid destination
-  std::map<int,std::vector<std::vector<std::pair<int,double> > > > localIndexToReceiveOnGridDest_;
+  std::list<RecvIndexGridDestinationMap> localIndexToReceiveOnGridDest_;
+
+  //! Number of local index of data to receive on grid destination
+  std::list<size_t> nbLocalIndexOnGridDest_;
 
   //! Position of axis and domain in grid