Changeset 1173

Timestamp:

06/19/17 16:00:48 (7 years ago)

Author:

mhnguyen

Message:

Fixing bug: Overlapped domains behave incorrectly

+) If local domains are overlapping on client, the re-constructed domain on server must take care of this overlapped region

Test
+) On Curie
+) test_client, test_complete work
+) Need to test with models

Location:

XIOS/dev/dev_olga

Files:

• inputs/COMPLETE/context_surface.xml (modified) (1 diff)
• src/node/domain.cpp (modified) (8 diffs)
• src/transformation/domain_algorithm_interpolate.cpp (modified) (2 diffs)
• src/transformation/domain_algorithm_interpolate.hpp (modified) (1 diff)
• src/transformation/generic_algorithm_transformation.cpp (modified) (1 diff)
• src/uuid.cpp (deleted)
• src/uuid.hpp (deleted)

XIOS/dev/dev_olga/inputs/COMPLETE/context_surface.xml

@@ -32 +32 @@
     </file>
 
-    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d">
-      <field field_ref="field_A_srf">
+    <file type="one_file" id="output_surface_1d" name="output_surface_1d" output_freq="1d" enabled="TRUE">
+      <field field_ref="field_A_srf" indexed_output="TRUE">
         <variable id="my_attribute1" type="string">surf_att</variable>
         <variable id="my_attribute2" type="int">10</variable>

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

@@ -2463 +2463 @@
     }
     
+    globalLocalIndexMap_.rehash(std::ceil(nbIndGlob/globalLocalIndexMap_.max_load_factor()));
     i_index.resize(nbIndGlob);
-    j_index.resize(nbIndGlob);
-
-    globalLocalIndexMap_.rehash(std::ceil(nbIndGlob/globalLocalIndexMap_.max_load_factor()));
+    j_index.resize(nbIndGlob);    
     nbIndGlob = 0;
     for (i = 0; i < nbReceived; ++i)
@@ -2474 +2473 @@
       {
          index = tmp(ind);
-         i_index(nbIndGlob) = index % ni_glo;
-         j_index(nbIndGlob) = index / ni_glo;
-         globalLocalIndexMap_[index] = nbIndGlob;  
-         ++nbIndGlob;
+         if (0 == globalLocalIndexMap_.count(index))
+         {
+           i_index(nbIndGlob) = index % ni_glo;
+           j_index(nbIndGlob) = index / ni_glo;
+           globalLocalIndexMap_[index] = nbIndGlob;  
+           ++nbIndGlob;
+         } 
       } 
     } 
+
+    i_index.resizeAndPreserve(nbIndGlob);
+    j_index.resizeAndPreserve(nbIndGlob);
   }
 
@@ -2630 +2635 @@
   void CDomain::recvMask(std::map<int, CBufferIn*>& rankBuffers)
   {
-    int nbReceived = rankBuffers.size(), i, ind, index;
+    int nbReceived = rankBuffers.size(), i, ind, index, lInd;
     if (nbReceived != recvClientRanks_.size())
-      ERROR("void CDomain::recvArea(std::map<int, CBufferIn*>& rankBuffers)",
+      ERROR("void CDomain::recvMask(std::map<int, CBufferIn*>& rankBuffers)",
            << "The number of sending clients is not correct."
            << "Expected number: " << recvClientRanks_.size() << " but received " << nbReceived);
@@ -2650 +2655 @@
     }
   
+    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)
       {
-        mask_1d(nbMaskInd) = tmp(ind);      
-        ++nbMaskInd;
+        lInd = globalLocalIndexMap_[size_t(tmpInd(ind))];
+        mask_1d(lInd) = tmp(ind);
       }
     }    
@@ -2717 +2728 @@
     
       if (nbLonInd != globalLocalIndexMap_.size())
-        info (0) << "Something wrong with longitude index "<< std::endl;
-
+        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();
       lonvalue.resize(nbLonInd);
       if (hasBounds)
@@ -2799 +2812 @@
     
       if (nbLatInd != globalLocalIndexMap_.size())
-        info (0) << "Something wrong with latitude index "<< std::endl;
-
+        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();
       latvalue.resize(nbLatInd);
       if (hasBounds)
@@ -2870 +2885 @@
     }
 
-    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;      
@@ -2988 +3005 @@
       {
          lInd = globalLocalIndexMap_[size_t(tmpInd(ind))];
-         dataIIndex(lInd) = tmpI(ind);
-         dataJIndex(lInd) = tmpJ(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);         
       } 
     }

XIOS/dev/dev_olga/src/transformation/domain_algorithm_interpolate.cpp

@@ -388 +388 @@
   }
 
-  if (writeToFile_ && !readFromFile_)
-     writeRemapInfo(interpMapValue);
-  exchangeRemapInfo(interpMapValue);
+  if (writeToFile_ && !readFromFile_) writeRemapInfo(interpMapValue);
+//  exchangeRemapInfo(interpMapValue);
+  convertRemapInfo(interpMapValue) ;
 
   delete [] globalSrc;
@@ -494 +494 @@
 }
 
+void CDomainAlgorithmInterpolate::convertRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue)
+{
+  CContext* context = CContext::getCurrent();
+  CContextClient* client=context->client;
+  int clientRank = client->clientRank;
+
+  this->transformationMapping_.resize(1);
+  this->transformationWeight_.resize(1);
+
+  TransformationIndexMap& transMap = this->transformationMapping_[0];
+  TransformationWeightMap& transWeight = this->transformationWeight_[0];
+
+  std::map<int,std::vector<std::pair<int,double> > >::const_iterator itb = interpMapValue.begin(), it,
+                                                                     ite = interpMapValue.end();
+  
+  for (it = itb; it != ite; ++it)
+  {    
+    const std::vector<std::pair<int,double> >& tmp = it->second;
+    for (int i = 0; i < tmp.size(); ++i)
+    {
+      transMap[it->first].push_back(tmp[i].first);
+      transWeight[it->first].push_back(tmp[i].second);
+    }      
+  }      
+}
 
 /*!

XIOS/dev/dev_olga/src/transformation/domain_algorithm_interpolate.hpp

@@ -44 +44 @@
   void writeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >&);
   void exchangeRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue);
+  void convertRemapInfo(std::map<int,std::vector<std::pair<int,double> > >& interpMapValue);
 
 private:

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

@@ -45 +45 @@
       {
         dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
-      }
-    }
-
-    // for (int idx = 0; idx < nbLocalIndex; ++idx)
-    // {
-    //   if (!flagInitial[localIndex[idx].first])
-    //     dataOut(localIndex[idx].first) = defaultValue;
-    // }
+        flagInitial[localIndex[idx].first] = true; // Reset flag to indicate not all data source are nan
+      }
+    }
+
+    for (int idx = 0; idx < nbLocalIndex; ++idx)
+    {
+      if (!flagInitial[localIndex[idx].first])
+        dataOut(localIndex[idx].first) = defaultValue;
+    }
   }
   else