Changeset 1400 for XIOS

Timestamp:

01/11/18 17:15:58 (6 years ago)

Author:

ymipsl

Message:

2 bug fix for spatial transformation

• Dynamic spatial transformation distributed :: missing information saved in the class for next time step

• Non distributed transformation : solve local mask grid problem for intermediate grid

• take into account some transformation that are always considered as distributed

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/transformation

Files:

• generic_algorithm_transformation.cpp (modified) (8 diffs)
• generic_algorithm_transformation.hpp (modified) (1 diff)

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

@@ -120 +120 @@
   if (!isDistributedComputed_)
   {
-    CContext* context = CContext::getCurrent();
-    CContextClient* client = context->client;
-  
-    computePositionElements(gridSrc, gridDst);
-    std::vector<CScalar*> scalarListSrcP  = gridSrc->getScalars();
-    std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
-    std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
-    int distributed, distributed_glo ;
-  
-    CArray<int,1> axisDomainSrcOrder = gridSrc->axis_domain_order;
-    if (2 == axisDomainSrcOrder(elementPositionInGrid)) // It's domain
-    {
-      distributed=domainListSrcP[elementPositionInGridSrc2DomainPosition_[elementPositionInGrid]]->isDistributed() ;
-      MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
+    isDistributedComputed_=true ;
+    if (!eliminateRedondantSrc_) isDistributed_=true ;
+    else
+    {
+      CContext* context = CContext::getCurrent();
+      CContextClient* client = context->client;
+  
+      computePositionElements(gridSrc, gridDst);
+      std::vector<CScalar*> scalarListSrcP  = gridSrc->getScalars();
+      std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
+      std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
+      int distributed, distributed_glo ;
+  
+      CArray<int,1> axisDomainSrcOrder = gridSrc->axis_domain_order;
+      if (2 == axisDomainSrcOrder(elementPositionInGrid)) // It's domain
+      {
+        distributed=domainListSrcP[elementPositionInGridSrc2DomainPosition_[elementPositionInGrid]]->isDistributed() ;
+        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
     
-    }
-    else if (1 == axisDomainSrcOrder(elementPositionInGrid))//it's an axis
-    {
-      distributed=axisListSrcP[elementPositionInGridSrc2AxisPosition_[elementPositionInGrid]]->isDistributed() ;
-      MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
-    }
-    else //it's a scalar
-    {
-      distributed_glo=false ;
-    } 
-    isDistributed_=distributed_glo ;
-    isDistributedComputed_=true ;
+      }
+      else if (1 == axisDomainSrcOrder(elementPositionInGrid))//it's an axis
+      {
+        distributed=axisListSrcP[elementPositionInGridSrc2AxisPosition_[elementPositionInGrid]]->isDistributed() ;
+        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
+      }
+      else //it's a scalar
+      {
+        distributed_glo=false ;
+      } 
+      isDistributed_=distributed_glo ;
+    }
   }
   return isDistributed_ ;
@@ -235 +239 @@
   computeGlobalIndexOnProc = (0 < recvValue);
 
-  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;
+//  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;
 
   if (computeGlobalIndexOnProc || !computedProcSrcNonTransformedElement_)
   {    
+    {
+      CClientClientDHTInt::Index2VectorInfoTypeMap tmp ;
+      globalIndexOfTransformedElementOnProc_.swap(tmp) ;
+    }
     // Find out global index source of transformed element on corresponding process.    
     if (globalElementIndexOnProc_.empty())
@@ -245 +253 @@
     for (idx = 0; idx < axisDomainDstOrder.numElements(); ++idx)
     {
+      
       if (idx == elementPositionInGrid)
-        computeExchangeGlobalIndex(indexSrc, axisDomainSrcOrder(idx), globalIndexOfTransformedElementOnProc); //globalElementIndexOnProc[idx]);
+        computeExchangeGlobalIndex(indexSrc, axisDomainSrcOrder(idx), globalIndexOfTransformedElementOnProc_); //globalElementIndexOnProc[idx]);
       if (!computedProcSrcNonTransformedElement_)
       {
@@ -340 +349 @@
           set<int> tmpSet ; 
           procList.swap(tmpSet) ;
-          CClientClientDHTInt::Index2VectorInfoTypeMap::iterator itIdxb = globalIndexOfTransformedElementOnProc.begin(),
-                                                                 itIdxe = globalIndexOfTransformedElementOnProc.end(), itIdx;
+          CClientClientDHTInt::Index2VectorInfoTypeMap::iterator itIdxb = globalIndexOfTransformedElementOnProc_.begin(),
+                                                                 itIdxe = globalIndexOfTransformedElementOnProc_.end(), itIdx;
           for (itIdx = itIdxb; itIdx != itIdxe; ++itIdx)
           {
@@ -406 +415 @@
           tmpCounter.insert(srcIndex[idx]);
        
-          vector<int>& rankSrc = globalIndexOfTransformedElementOnProc[srcIndex[idx]] ;
+          vector<int>& rankSrc = globalIndexOfTransformedElementOnProc_[srcIndex[idx]] ;
           for (int n=0;n<rankSrc.size();++n)
           {
@@ -856 +865 @@
   vector<int> nIndexSrc(nElement) ;
   vector<int> nIndexDst(nElement) ;
+  int nlocalIndexSrc=1 ;
   int nlocalIndexDest=1 ;
   
@@ -875 +885 @@
       nIndexSrc[i]=1 ;
     }
+    nlocalIndexSrc=nlocalIndexSrc*nIndexSrc[i] ;
   }
 
@@ -934 +945 @@
 // just get the local src mask
   CArray<bool,1> localMaskOnSrcGrid;
-  gridSrc->getLocalMask(localMaskOnSrcGrid) ; 
+  gridSrc->getLocalMask(localMaskOnSrcGrid) ;
+// intermediate grid, mask is not initialized => set up mask to true
+  if (localMaskOnSrcGrid.isEmpty()) localMaskOnSrcGrid.resize(nlocalIndexSrc) ;
+  localMaskOnSrcGrid=true ;
   
 

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

@@ -158 +158 @@
   std::vector< set<int> > procElementList_ ; // List of processes containing source index of elements
 
-
+  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc_;
+  
   bool computedProcSrcNonTransformedElement_; // Flag to indicate whether we computed proc containing non transformed elements