Changeset 1201 for XIOS/dev/dev_olga/src/node/domain.cpp

Timestamp:

07/07/17 18:17:49 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging trunk r1200 (except for non-contiguous zoom) into dev. Tested on Curie. Todo: non-contiguous zoom.

File:

• XIOS/dev/dev_olga/src/node/domain.cpp (modified) (8 diffs)

XIOS/dev/dev_olga/src/node/domain.cpp

@@ -2463 +2463 @@
     }
     
+    i_index.resize(nbIndGlob);
+    j_index.resize(nbIndGlob);
+
     globalLocalIndexMap_.rehash(std::ceil(nbIndGlob/globalLocalIndexMap_.max_load_factor()));
-    i_index.resize(nbIndGlob);
-    j_index.resize(nbIndGlob);    
     nbIndGlob = 0;
     for (i = 0; i < nbReceived; ++i)
@@ -2473 +2474 @@
       {
          index = tmp(ind);
-         if (0 == globalLocalIndexMap_.count(index))
-         {
-           i_index(nbIndGlob) = index % ni_glo;
-           j_index(nbIndGlob) = index / ni_glo;
-           globalLocalIndexMap_[index] = nbIndGlob;  
-           ++nbIndGlob;
-         } 
+         i_index(nbIndGlob) = index % ni_glo;
+         j_index(nbIndGlob) = index / ni_glo;
+         globalLocalIndexMap_[index] = nbIndGlob;  
+         ++nbIndGlob;
       } 
     } 
-
-    i_index.resizeAndPreserve(nbIndGlob);
-    j_index.resizeAndPreserve(nbIndGlob);
   }
 
@@ -2635 +2630 @@
   void CDomain::recvMask(std::map<int, CBufferIn*>& rankBuffers)
   {
-    int nbReceived = rankBuffers.size(), i, ind, index, lInd;
+    int nbReceived = rankBuffers.size(), i, ind, index;
     if (nbReceived != recvClientRanks_.size())
-      ERROR("void CDomain::recvMask(std::map<int, CBufferIn*>& rankBuffers)",
+      ERROR("void CDomain::recvArea(std::map<int, CBufferIn*>& rankBuffers)",
            << "The number of sending clients is not correct."
            << "Expected number: " << recvClientRanks_.size() << " but received " << nbReceived);
@@ -2655 +2650 @@
     }
   
-    if (nbMaskInd != globalLocalIndexMap_.size())
-      info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes."
-               << "Something shouble be wrong with mask index "<< std::endl;
-
-    nbMaskInd = globalLocalIndexMap_.size();
     mask_1d.resize(nbMaskInd);
-    
+    nbMaskInd = 0;
     for (i = 0; i < nbReceived; ++i)
     {
-      CArray<int,1>& tmpInd = indGlob_[recvClientRanks_[i]];
       CArray<bool,1>& tmp = recvMaskValue[i];
       for (ind = 0; ind < tmp.numElements(); ++ind)
       {
-        lInd = globalLocalIndexMap_[size_t(tmpInd(ind))];
-        mask_1d(lInd) = tmp(ind);
+        mask_1d(nbMaskInd) = tmp(ind);      
+        ++nbMaskInd;
       }
     }    
@@ -2728 +2717 @@
     
       if (nbLonInd != globalLocalIndexMap_.size())
-        info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes."
-                 << "Something shouble be wrong with longitude index "<< std::endl;
-
-      nbLonInd = globalLocalIndexMap_.size();
+        info (0) << "Something wrong with longitude index "<< std::endl;
+
       lonvalue.resize(nbLonInd);
       if (hasBounds)
@@ -2812 +2799 @@
     
       if (nbLatInd != globalLocalIndexMap_.size())
-        info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes."
-                << "Something shouble be wrong with latitude index "<< std::endl;
-
-      nbLatInd = globalLocalIndexMap_.size();
+        info (0) << "Something wrong with latitude index "<< std::endl;
+
       latvalue.resize(nbLatInd);
       if (hasBounds)
@@ -2885 +2870 @@
     }
 
+    int nbAreaInd = 0;
+    for (i = 0; i < nbReceived; ++i)
+    {      
+      nbAreaInd += recvAreaValue[i].numElements();
+    }
+  
+    if (nbAreaInd != globalLocalIndexMap_.size())
+      info (0) << "Something wrong with latitude index "<< std::endl;
+
     if (hasArea)
     {
-      int nbAreaInd = 0;
-      for (i = 0; i < nbReceived; ++i)
-      {      
-        nbAreaInd += recvAreaValue[i].numElements();
-      }
-
-      if (nbAreaInd != globalLocalIndexMap_.size())
-        info (0) << "If the domain " << this->getDomainOutputName() <<" does not have overlapped region between processes."
-                 << "Something shouble be wrong with area index "<< std::endl;
-
-      nbAreaInd = globalLocalIndexMap_.size();
       areavalue.resize(nbAreaInd);
       nbAreaInd = 0;      
@@ -3005 +2988 @@
       {
          lInd = globalLocalIndexMap_[size_t(tmpInd(ind))];
-         dataIIndex(lInd) = (-1 == dataIIndex(lInd)) ? tmpI(ind) : dataIIndex(lInd); // Only fill in dataIndex if there is no data
-         dataJIndex(lInd) = (-1 == dataJIndex(lInd)) ? tmpJ(ind) : dataJIndex(lInd);         
+         dataIIndex(lInd) = tmpI(ind);
+         dataJIndex(lInd) = tmpJ(ind);         
       } 
     }