Changeset 1399 for XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.hpp

Timestamp:

01/10/18 16:17:57 (6 years ago)

Author:

ymipsl

Message:

2 update for spatial tranformations :

• One bug fix introduce in r1389 concerning domain interpolation or other distributed spatial distransfomation

• Specific optimisation for transformation on element wich is not distributed across processes

This optimisation is experimental and will be activated only when using a variable in xios context :

<variable id="activate_non_distributed_transformation" type="bool">true</variable>

Later when more succesfull test, the variable use will removed...

YM

File:

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

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.hpp

@@ -52 +52 @@
   virtual ~CGenericAlgorithmTransformation() {}
 
+  bool isDistributedTransformation(int elementPositionInGrid, CGrid* gridSrc, CGrid* gridDst) ;
+
   void computeGlobalSourceIndex(int elementPositionInGrid,
                                CGrid* gridSrc,
@@ -85 +87 @@
   */
   void computeIndexSourceMapping(const std::vector<CArray<double,1>* >& dataAuxInputs = std::vector<CArray<double,1>* >());
+  void computeTransformationMappingNonDistributed(int elementPositionInGrid, CGrid* gridSrc, CGrid* gridDst,
+                                                  vector<int>& localSrc, vector<int>& localDst, vector<double>& weight, vector<bool>& localMaskOnGridDest);
+  void nonDistributedrecursiveFunct(int currentPos, int elementPositionInGrid, int& srcInd, vector<int>& nIndexSrc, int& t, vector<vector<vector<pair<int,double> > > >& dstIndWeight, int currentInd,
+                                     vector<int>& localSrc, vector<int>& localDst, vector<double>& weight, CArray<bool,1>& localMaskOnGridSrc, vector<bool>& localMaskOnGridDest) ;
 
 protected:
@@ -126 +132 @@
 
 protected:
+  //! indicate if the transformation is performed on a distributed element
+  bool isDistributed_ ;
+  //! indicate if the method  isDistributedTransformation has been called before
+  bool isDistributedComputed_ ;
+  
   //! Map between global index of destination element and source element
   std::vector<TransformationIndexMap> transformationMapping_;
@@ -144 +155 @@
   std::vector<int> procContainSrcElementIdx_;  // List of processes containing source index of transformed elements
 //  std::set<int> procOfNonTransformedElements_; // Processes contain the source index of non-transformed elements
+  std::set<int> commonProc_;
   std::vector< set<int> > procElementList_ ; // List of processes containing source index of elements