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

Timestamp:

06/09/16 11:33:37 (8 years ago)

Author:

mhnguyen

Message:

Correcting a bug which sometimes make transformations between different size grids incorrect

+) Correct inputs of some functions
+) Add some auxilliary functions.
+) Add new test cases for test_remap

Test
+) Basic test pass
+) Single horizontal and vertical interpolation are correct
+) Chained interpolation are not correct

File:

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

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -49 +49 @@
   const std::list<RecvIndexGridDestinationMap>& getLocalIndexToReceiveOnGridDest() const;
   const std::list<size_t>& getNbLocalIndexToReceiveOnGridDest() const;
+  const std::list<std::vector<bool> >& getLocalMaskIndexOnGridDest() const;
 
   CGrid* getGridSource() { return originalGridSource_; }
@@ -66 +67 @@
   void selectDomainAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
   void selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, bool isDomainAlgo);
-  void setUpGrid(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
+  void setUpGridSource(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
+  void setUpGridDestination(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
   void computeTransformationMapping(const SourceDestinationIndexMap& globalIndexWeightFromSrcToDest);
   bool isSpecialTransformation(ETranformationType transType);
@@ -75 +77 @@
 
   //! Grid destination on transformation
-  CGrid* gridDestination_;
+  CGrid* gridDestination_, *tmpGridDestination_;
 
   //! The grid source of the first transformation (original grid source)
@@ -104 +106 @@
   //! Number of local index of data to receive on grid destination
   std::list<size_t> nbLocalIndexOnGridDest_;
+  std::list<std::vector<bool> > localMaskOnGridDest_;
 
   //! Position of axis and domain in grid
   std::map<int, int> elementPosition2AxisPositionInGrid_, elementPosition2DomainPositionInGrid_;
 
-  std::vector<CGrid*> tempGrids_;
+  std::vector<CGrid*> tempGridSrcs_, tempGridDests_;
   std::vector<StdString> auxInputs_;
   bool dynamicalTransformation_;