Changeset 1389

Timestamp:

12/22/17 14:57:35 (6 years ago)

Author:

ymipsl

Message:

Fix regression on vertical interpolation with pressure level.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/transformation

Files:

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

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

@@ -254 +254 @@
       }
     }
-      
+
+/*      
     if (!computedProcSrcNonTransformedElement_)
     {
@@ -292 +293 @@
 
     procContainSrcElementIdx_.swap(procContainSrcElementIdx);    
-
+*/
+    std::set<int> commonProc ;
+    if (procElementList_.empty()) procElementList_.resize(axisDomainDstOrder.numElements()) ;
+    for (idx = 0; idx < axisDomainDstOrder.numElements(); ++idx)
+    {
+      std::set<int>& procList=procElementList_[idx] ;
+      std::set<int> commonTmp ;
+      if (idx == elementPositionInGrid)
+      {
+          set<int> tmpSet ; 
+          procList.swap(tmpSet) ;
+          CClientClientDHTInt::Index2VectorInfoTypeMap::iterator itIdxb = globalIndexOfTransformedElementOnProc.begin(),
+                                                                 itIdxe = globalIndexOfTransformedElementOnProc.end(), itIdx;
+          for (itIdx = itIdxb; itIdx != itIdxe; ++itIdx)
+          {
+             std::vector<int>& tmp = itIdx->second;
+             for (int i = 0; i < tmp.size(); ++i) procList.insert(tmp[i]);
+             if (tmp.size() == nbClient)
+             break;
+          }
+      }
+      else
+      {
+        if (!computedProcSrcNonTransformedElement_)
+        {
+          set<int> tmpSet ; 
+          procList.swap(tmpSet) ;
+          boost::unordered_map<int,std::vector<size_t> >::iterator itb = globalElementIndexOnProc_[idx].begin(), it,
+                                                                   ite = globalElementIndexOnProc_[idx].end();
+          for (it = itb; it != ite; ++it)
+          {
+            procList.insert(it->first);
+            if (procList.size() == nbClient)  break;
+          }
+        }
+      }
+
+      if (idx==0) commonProc.swap(procList) ;
+      else
+      {
+        for (std::set<int>::iterator it = commonProc.begin(); it != commonProc.end(); ++it)
+          if (procList.count(*it)==1) commonTmp.insert(*it) ;
+        commonProc.swap(commonTmp) ;
+      }
+    }
+    std::vector<int> procContainSrcElementIdx(commonProc.size());
+    int count = 0;
+    for (std::set<int>::iterator it = commonProc.begin(); it != commonProc.end(); ++it) procContainSrcElementIdx[count++] = *it;
+    procContainSrcElementIdx_.swap(procContainSrcElementIdx);
+    
         // For the first time, surely we calculate proc containing non transformed elements
-    if (!computedProcSrcNonTransformedElement_)
-      computedProcSrcNonTransformedElement_ = true;
+    if (!computedProcSrcNonTransformedElement_) computedProcSrcNonTransformedElement_ = true;
   }
   
@@ -320 +369 @@
         {          
           tmpCounter.insert(srcIndex[idx]);
-
-           std::vector<int>& srcProc = globalIndexOfTransformedElementOnProc[srcIndex[idx]];
-           for (int j = 0; j < srcProc.size(); ++j)
-              globalElementIndexOnProc_[elementPositionInGrid][srcProc[j]].push_back(srcIndex[idx]);
-/*          
+       
           for (int j = 0; j < procContainSrcElementIdx_.size(); ++j)
-            globalElementIndexOnProc_[elementPositionInGrid][procContainSrcElementIdx_[j]].push_back(srcIndex[idx]);*/
+            globalElementIndexOnProc_[elementPositionInGrid][procContainSrcElementIdx_[j]].push_back(srcIndex[idx]);
         }
       }

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

@@ -143 +143 @@
 
   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> procOfNonTransformedElements_; // Processes contain the source index of non-transformed elements
+  std::vector< set<int> > procElementList_ ; // List of processes containing source index of elements