Changeset 1399 for XIOS/dev/XIOS_DEV_CMIP6/src/transformation/grid_transformation.cpp

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/grid_transformation.cpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/grid_transformation.cpp

@@ -16 +16 @@
 #include "grid.hpp"
 #include <boost/unordered_map.hpp>
+#include "timer.hpp"
 
 namespace xios {
@@ -389 +390 @@
       // ComputeTransformation of global index of each element
       int elementPosition = it->first;
-      algo->computeGlobalSourceIndex(elementPosition,
-                                     gridSource_,
-                                     tmpGridDestination_,
-                                     globaIndexWeightFromSrcToDst);
-
-      // Compute transformation of global indexes among grids
-      computeTransformationMapping(globaIndexWeightFromSrcToDst);
-
+      bool nonDistributedActivated = CXios::getin<bool>("activate_non_distributed_transformation",false);
+      
+      if (nonDistributedActivated && !algo->isDistributedTransformation(elementPositionInGrid, gridSource_, tmpGridDestination_) )
+      {
+        vector<int> localSrc ;
+        vector<int> localDst ;
+        vector<double> weight ;
+        localMaskOnGridDest_.push_back(vector<bool>()) ;
+        CTimer::get("computeTransformationMappingNonDistributed").resume();  
+        algo->computeTransformationMappingNonDistributed(elementPosition, gridSource_, tmpGridDestination_, 
+                                                         localSrc, localDst, weight, localMaskOnGridDest_.back()) ;
+        CTimer::get("computeTransformationMappingNonDistributed").suspend();  
+
+        CTimer::get("computeTransformationMappingConvert").resume();  
+        nbLocalIndexOnGridDest_.push_back(localMaskOnGridDest_.back().size()) ;
+        int clientRank=client->clientRank ;
+        {
+          SendingIndexGridSourceMap tmp;
+          localIndexToSendFromGridSource_.push_back(tmp) ;
+          SendingIndexGridSourceMap& src=localIndexToSendFromGridSource_.back() ;
+          CArray<int,1> arrayTmp ;
+          src.insert( pair<int,CArray<int,1> >(clientRank,arrayTmp)) ;
+          CArray<int,1>& array=src[clientRank] ;
+          array.resize(localSrc.size()) ;
+          for(int i=0;i< localSrc.size();++i) array(i)=localSrc[i]  ;    
+        }
+        {
+          RecvIndexGridDestinationMap tmp;
+          localIndexToReceiveOnGridDest_.push_back(tmp) ;
+          RecvIndexGridDestinationMap& dst=localIndexToReceiveOnGridDest_.back() ;
+          vector<pair<int,double> > vectTmp ;
+          dst.insert( pair<int,vector<pair<int,double> >  >(clientRank,vectTmp)) ;
+          vector<pair<int,double> >& vect=dst[clientRank] ;
+          vect.resize(localDst.size()) ;
+          for(int i=0;i< localDst.size();++i) vect[i]=pair<int,double>(localDst[i],weight[i])  ;      
+        }
+        CTimer::get("computeTransformationMappingConvert").suspend();  
+      }
+      else
+      {
+        CTimer::get("computeGlobalSourceIndex").resume();           
+        algo->computeGlobalSourceIndex(elementPosition,
+                                       gridSource_,
+                                       tmpGridDestination_,
+                                       globaIndexWeightFromSrcToDst);
+                                     
+        CTimer::get("computeGlobalSourceIndex").suspend();           
+        CTimer::get("computeTransformationMapping").resume();     
+        // Compute transformation of global indexes among grids
+        computeTransformationMapping(globaIndexWeightFromSrcToDst);
+        CTimer::get("computeTransformationMapping").suspend(); 
+      } 
       if (1 < nbNormalAlgos_)
       {