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

Timestamp:

07/07/15 10:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:

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

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -24 +24 @@
   This class is an interface for all transformations to interact with the rest of XIOS.
 The class, firstly, tries to get all information relating to requested transformations by retrieving directly from grid.
-Then with all these information, all necessary transformations will be be created by generic class \class CGenericAlgorithmTransformation.
+Then with all these information, all necessary transformations will be created by generic class \class CGenericAlgorithmTransformation.
 Because there are information exchange among clients to accomplish the transformations (e.g: some index need retrieving from other clients),
 this class uses class \class CTransformationMapping to fulfill this demand.
@@ -41 +41 @@
 
   const std::map<int, CArray<int,1>* >& getLocalIndexToSendFromGridSource() const;
-  const std::map<int, std::vector<CArray<int,1>* > >& getLocalIndexToReceiveOnGridDest() const;
+  const std::map<int, std::vector<std::vector<std::pair<int,double> > > >& getLocalIndexToReceiveOnGridDest() const;
 
 private:
@@ -55 +55 @@
   void setUpGrid(int elementPositionInGrid, ETranformationType transType);
   void computeFinalTransformationMapping();
-  void computeTransformationFromOriginalGridSource(const std::map<size_t, std::set<size_t> >& globaIndexMapFromDestToSource);
+  void computeTransformationFromOriginalGridSource(const std::map<size_t, std::vector<std::pair<size_t,double> > >& globaIndexMapFromDestToSource);
   void updateFinalGridDestination();
 
@@ -89 +89 @@
 
   //! Local index of data to receive on grid destination
-  std::map<int, std::vector<CArray<int,1>* > > localIndexToReceiveOnGridDest_;
+  std::map<int,std::vector<std::vector<std::pair<int,double> > > > localIndexToReceiveOnGridDest_;
 
   //! Position of axis and domain in grid
@@ -97 +97 @@
   CArray<size_t,1>* globalIndexOfCurrentGridSource_;
   CArray<size_t,1>* globalIndexOfOriginalGridSource_;
+  CArray<double,1>* weightOfGlobalIndexOfOriginalGridSource_;
 };