Changeset 1201 for XIOS/dev/dev_olga/src/node

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.

Location:

XIOS/dev/dev_olga/src/node

Files:

• axis.hpp (modified) (2 diffs)
• calendar_wrapper.cpp (modified) (1 diff)
• context.cpp (modified) (4 diffs)
• domain.cpp (modified) (8 diffs)
• field.cpp (modified) (12 diffs)
• field_impl.hpp (modified) (1 diff)
• file.cpp (modified) (2 diffs)
• grid.cpp (modified) (5 diffs)
• grid.hpp (modified) (1 diff)
• zoom_axis.cpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/node/axis.hpp

@@ -123 +123 @@
         int zoom_begin_srv, zoom_end_srv, zoom_size_srv;
         int ni_srv, begin_srv, end_srv;
+        int global_zoom_begin_srv, global_zoom_end_srv, global_zoom_size_srv;
         CArray<double,1> value_srv;
         CArray<double,2> bound_srv;
         CArray<StdString,1> label_srv;
+        CArray<int,1> zoom_index_srv;
         bool hasValue;
         CArray<int,1> globalDimGrid;
@@ -144 +146 @@
          void computeConnectedServer(const std::vector<int>& globalDim, int orderPositionInGrid,
                                      CServerDistributionDescription::ServerDistributionType distType);
+         bool zoomByIndex();
 
          void sendNonDistributedAttributes(void);

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

@@ -7 +7 @@
 namespace xios {
 
-  /// ////////////////////// Dfinitions ////////////////////// ///
+  /// ////////////////////// Définitions ////////////////////// ///
 
   CCalendarWrapper::CCalendarWrapper(void)

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

@@ -291 +291 @@
    void CContext::setClientServerBuffer(CContextClient* contextClient)
    {
-     size_t minBufferSize = CXios::minBufferSize;
+      // Estimated minimum event size for small events (10 is an arbitrary constant just for safety)
+      const size_t minEventSize = CEventClient::headerSize + getIdServer().size() + 10 * sizeof(int);
+
+      // Ensure there is at least some room for 20 of such events in the buffers
+      size_t minBufferSize = std::max(CXios::minBufferSize, 20 * minEventSize);
+
 #define DECLARE_NODE(Name_, name_)    \
      if (minBufferSize < sizeof(C##Name_##Definition)) minBufferSize = sizeof(C##Name_##Definition);
@@ -299 +304 @@
 #undef DECLARE_NODE_PAR
 
+     // Compute the buffer sizes needed to send the attributes and data corresponding to fields
      std::map<int, StdSize> maxEventSize;
      std::map<int, StdSize> bufferSize = getAttributesBufferSize(maxEventSize, contextClient);
@@ -307 +313 @@
        if (it->second > bufferSize[it->first]) bufferSize[it->first] = it->second;
 
+     // Apply the buffer size factor and check that we are above the minimum buffer size
      ite = bufferSize.end();
      for (it = bufferSize.begin(); it != ite; ++it)
@@ -314 +321 @@
      }
 
-     // We consider that the minimum buffer size is also the minimum event size
-     ite = maxEventSize.end();
-     for (it = maxEventSize.begin(); it != ite; ++it)
-       if (it->second < minBufferSize) it->second = minBufferSize;
-
+     // Leaders will have to send some control events so ensure there is some room for those in the buffers
      if (contextClient->isServerLeader())
      {
        const std::list<int>& ranks = contextClient->getRanksServerLeader();
        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-         if (!bufferSize.count(*itRank)) bufferSize[*itRank] = maxEventSize[*itRank] = minBufferSize;
+       {
+         if (!bufferSize.count(*itRank))
+         {
+           bufferSize[*itRank] = minBufferSize;
+           maxEventSize[*itRank] = minEventSize;
+         }
+       }
      }
      contextClient->setBufferSize(bufferSize, maxEventSize);

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);         
       } 
     }

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

@@ -131 +131 @@
 
     CContext* context = CContext::getCurrent();
-      CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
-
-      CEventClient event(getType(), EVENT_ID_UPDATE_DATA);
-
-      map<int, CArray<int,1> >::iterator it;
-      list<CMessage> list_msg;
-      list<CArray<double,1> > list_data;
-
-      if (!grid->doGridHaveDataDistributed())
+    CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
+
+    CEventClient event(getType(), EVENT_ID_UPDATE_DATA);
+
+    map<int, CArray<int,1> >::iterator it;
+    list<CMessage> list_msg;
+    list<CArray<double,1> > list_data;
+
+    if (!grid->doGridHaveDataDistributed())
+    {
+       if (client->isServerLeader())
+       {
+          for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
+          {
+            int rank = it->first;
+            CArray<int,1>& index = it->second;
+
+            list_msg.push_back(CMessage());
+            list_data.push_back(CArray<double,1>(index.numElements()));
+
+            CArray<double,1>& data_tmp = list_data.back();
+            for (int n = 0; n < data_tmp.numElements(); n++) data_tmp(n) = data(index(n));
+
+            list_msg.back() << getId() << data_tmp;
+            event.push(rank, 1, list_msg.back());
+          }
+          client->sendEvent(event);
+        }
+      else client->sendEvent(event);
+    }
+    else
+    {
+      for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
       {
-         if (client->isServerLeader())
-         {
-            for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
-            {
-              int rank = it->first;
-              CArray<int,1>& index = it->second;
-
-              list_msg.push_back(CMessage());
-              list_data.push_back(CArray<double,1>(index.numElements()));
-
-              CArray<double,1>& data_tmp = list_data.back();
-              for (int n = 0; n < data_tmp.numElements(); n++) data_tmp(n) = data(index(n));
-
-              list_msg.back() << getId() << data_tmp;
-              event.push(rank, 1, list_msg.back());
-            }
-            client->sendEvent(event);
-         }
-         else client->sendEvent(event);
-      }
-      else
-      {
-        for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
-        {
-          int rank = it->first;
-          CArray<int,1>& index = it->second;
-
-          list_msg.push_back(CMessage());
-          list_data.push_back(CArray<double,1>(index.numElements()));
-
-          CArray<double,1>& data_tmp = list_data.back();
-          for (int n = 0; n < data_tmp.numElements(); n++) data_tmp(n) = data(index(n));
-
-          list_msg.back() << getId() << data_tmp;
-          event.push(rank, grid->nbSenders[0][rank], list_msg.back());
-        }
-        client->sendEvent(event);
-      }    
+        int rank = it->first;
+        CArray<int,1>& index = it->second;
+
+        list_msg.push_back(CMessage());
+        list_data.push_back(CArray<double,1>(index.numElements()));
+
+        CArray<double,1>& data_tmp = list_data.back();
+        for (int n = 0; n < data_tmp.numElements(); n++) data_tmp(n) = data(index(n));
+
+        list_msg.back() << getId() << data_tmp;
+        event.push(rank, grid->nbSenders[0][rank], list_msg.back());
+      }
+      client->sendEvent(event);
+    }
 
     CTimer::get("Field : send data").suspend();
@@ -276 +276 @@
   {
     CContext* context = CContext::getCurrent();
+//    CContextClient* client = context->client;
     CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
-
 
     lastDataRequestedFromServer = tsDataRequested;
@@ -336 +336 @@
     CContext* context = CContext::getCurrent();
     CContextClient* client = context->client;
+//    CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
 
     CEventClient event(getType(), EVENT_ID_READ_DATA_READY);
@@ -854 +855 @@
    {     
     if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform();
+
+     const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
+     const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
+
      CContext* context = CContext::getCurrent();
      bool hasWriterServer = context->hasServer && !context->hasClient;
@@ -906 +911 @@
              if (grid && grid != gridRef && grid->hasTransform())
              {
-               bool hasMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-               double defaultValue  = hasMissingValue ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
-               std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, hasMissingValue, defaultValue);
+                 std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue); 
 
                filter->connectOutput(filters.first, 0);
@@ -924 +927 @@
            instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,
                                                                                                        freq_offset.isEmpty() ? NoneDu : freq_offset,
-                                                                                                       true));
+                                                                                                       true,
+                                                                                                       detectMissingValues, defaultValue));
          else // The data might be passed from the model
          {
-            bool ignoreMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-            double defaultValue  = ignoreMissingValue ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
+            if (check_if_active.isEmpty()) check_if_active = false; 
             instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, NoneDu, false,
-                                                                                                        ignoreMissingValue, defaultValue));
+                                                                                                        detectMissingValues, defaultValue));
          }
        }
@@ -937 +940 @@
        if (enableOutput && !storeFilter && !fileWriterFilter)
        {
-         if (!read_access.isEmpty() && read_access)
-         {
-           storeFilter = boost::shared_ptr<CStoreFilter>(new CStoreFilter(gc, CContext::getCurrent(), grid));
-           instantDataFilter->connectOutput(storeFilter, 0);
-         }
-
-         if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write))
-         {
-           fileWriterFilter = boost::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
-           getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0);
-         }
+         storeFilter = boost::shared_ptr<CStoreFilter>(new CStoreFilter(gc, CContext::getCurrent(), grid,
+                                                                        detectMissingValues, defaultValue));
+         instantDataFilter->connectOutput(storeFilter, 0);
+       }
+
+       if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write))
+       {
+         fileWriterFilter = boost::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
+         getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0);
        }
      }
@@ -1001 +1002 @@
      if (!selfReferenceFilter)
      {
+       const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
+       const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
+
        if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
        {
@@ -1006 +1010 @@
            serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,
                                                                                    freq_offset.isEmpty() ? NoneDu : freq_offset,
-                                                                                   true));
+                                                                                   true,
+                                                                                   detectMissingValues, defaultValue));
+
          selfReferenceFilter = serverSourceFilter;
        }
@@ -1019 +1025 @@
          if (!clientSourceFilter)
          {
-           bool ignoreMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-           double defaultValue  = ignoreMissingValue ? default_value : (!default_value.isEmpty() ? default_value : 0.0); 
+           if (check_if_active.isEmpty()) check_if_active = false;
            clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, NoneDu, false,
-                                                                                   ignoreMissingValue, defaultValue));
+                                                                                   detectMissingValues, defaultValue));
          }
 
@@ -1056 +1061 @@
          freq_offset.setValue(NoneDu);
 
-       const bool ignoreMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
-
+       const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
+       
        boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                              CContext::getCurrent()->getCalendar()->getInitDate(),
                                                                              freq_op, freq_offset, outFreq,
-                                                                             ignoreMissingValue, ignoreMissingValue ? default_value : 0.0));
+                                                                             detectMissingValues, detectMissingValues ? default_value : 0.0));
        instantDataFilter->connectOutput(temporalFilter, 0);
 
@@ -1096 +1101 @@
        if (freq_offset.isEmpty()) freq_offset.setValue(NoneDu);
 
-       const bool ignoreMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
+       const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
 
        boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                              CContext::getCurrent()->getCalendar()->getInitDate(),
                                                                              freq_op, freq_offset, outFreq,
-                                                                             ignoreMissingValue, ignoreMissingValue ? default_value : 0.0));
+                                                                             detectMissingValues, detectMissingValues ? default_value : 0.0));
        selfReferenceFilter->connectOutput(temporalFilter, 0);
        return temporalFilter ;

XIOS/dev/dev_olga/src/node/field_impl.hpp

@@ -19 +19 @@
   {
     if (clientSourceFilter)
-      clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data);
+    {
+      if (check_if_active.isEmpty() || (!check_if_active.isEmpty() && (!check_if_active) || isActive(true)))
+        clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data);
+    }
     else if (instantDataFilter)
       ERROR("void CField::setData(const CArray<double, N>& _data)",

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

@@ -425 +425 @@
          if (!split_freq.isEmpty())
          {
-           CDate splitEnd = lastSplit + split_freq - 1 * Second;
+           CDate split_start ;
+           CDate splitEnd ;
+           if (!split_start_offset.isEmpty()) split_start=lastSplit + split_start_offset ;
+           else split_start=lastSplit ;
+
+           splitEnd = lastSplit + split_freq ;
+           if (!split_last_date.isEmpty())
+           {
+             CDate splitLastDate=CDate::FromString(split_last_date,*CContext::getCurrent()->getCalendar()) ;
+             if( splitLastDate < splitEnd)  splitEnd=splitLastDate ;
+           }
+            
+           if (!split_end_offset.isEmpty()) splitEnd = splitEnd + split_end_offset;
+           else splitEnd = splitEnd - 1 * Second;
 
            string splitFormat;
@@ -440 +453 @@
 
            oss << firstPart ;
-           if (hasStartDate) oss << lastSplit.getStr(splitFormat) ;
+           if (hasStartDate) oss << split_start.getStr(splitFormat) ;
            oss << middlePart ;
            if (hasEndDate) oss << splitEnd.getStr(splitFormat);

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

@@ -287 +287 @@
      nbSrvPools = 1;  
      for (int p = 0; p < nbSrvPools; ++p)
-     {    
-       if (context->hasClient && this->isChecked && doSendingIndex && !isIndexSent) 
-       { 
-         if (isScalarGrid())
-           sendIndexScalarGrid();
-         else
-           sendIndex();
-         this->isIndexSent = true; 
+     {       
+       if (isScalarGrid())
+       {  
+          if (context->hasClient)
+            if (this->isChecked && doSendingIndex && !isIndexSent) { sendIndexScalarGrid(); this->isIndexSent = true; }
+
+          if (this->isChecked) continue;
+  
+          if (context->hasClient)
+          {
+            this->computeIndexScalarGrid();
+          }
+  
+         if (!(this->hasTransform() && !this->isTransformed()))
+          this->isChecked = true;
+         continue;
        }
 
-       // Not sure about this
-       //if (!(this->hasTransform() && !this->isTransformed()))
-       // this->isChecked = true;
-       //return;
+       if (context->hasClient)
+       {
+         if (this->isChecked && doSendingIndex && !isIndexSent)
+            {sendIndex(); this->isIndexSent = true;}
+       }
      }
     
@@ -537 +546 @@
       if (computedWrittenIndex_) return;
       computedWrittenIndex_ = true;
-
-      if (isScalarGrid())
-      {
-        size_t nbWritten = 1;
-        int writtenIndex = 0;
-
-        localIndexToWriteOnClient.resize(nbWritten);  
-        localIndexToWriteOnServer.resize(nbWritten);
-        localIndexToWriteOnServer(0) = writtenIndex;
-        localIndexToWriteOnClient(0) = writtenIndex;
-        
-        return;
-      }
 
       size_t nbWritten = 0, indGlo;
@@ -750 +746 @@
    {
      CContext* context = CContext::getCurrent();
-     if (isScalarGrid())
+     computeClientIndex();
+     if (context->hasClient)
      {
-       computeClientIndexScalarGrid();
-       if (context->hasClient)
-       {
-         computeConnectedClientsScalarGrid();
-       }
-     }
-     else
-     {
-       computeClientIndex();
-       if (context->hasClient)
-       {
-         computeConnectedClients();
-       }
+       computeConnectedClients();
      }
    }
@@ -1186 +1171 @@
    }
 
-  void CGrid::computeClientIndexScalarGrid()
-  {
-    CContext* context = CContext::getCurrent();    
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1; // This should be changed soon
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (context->hasServer) ? (context->hasClient ? context->clientPrimServer[p] : context->client) 
-                                                    : context->client;
-
-      storeIndex_client.resize(1);
-      storeIndex_client(0) = 0;      
-
-      if (0 != serverDistribution_)
-      {
-        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClient.begin(),
-                                               ite = outGlobalIndexFromClient.end(), it;
-        for (it = itb; it != ite; ++it)
-        {
-          int rank = it->first;
-          CArray<size_t,1>& globalIndex = outGlobalIndexFromClient[rank];
-          outLocalIndexStoreOnClient.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
-          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient[rank];
-          if (1 != globalIndex.numElements())
-            ERROR("void CGrid::computeClientIndexScalarGrid()",
-              << "Something wrong happened. "
-              << "Number of received global index on scalar grid should equal to 1" 
-              << "Number of received global index " << globalIndex.numElements() << ".");
-
-          localIndex(0) = globalIndex(0);
-        }
-      }
-    }
-  }
-
-  void CGrid::computeConnectedClientsScalarGrid()
+  void CGrid::computeIndexScalarGrid()
   {
     CContext* context = CContext::getCurrent();    
@@ -1230 +1181 @@
     for (int p = 0; p < nbSrvPools; ++p)
     {
-      CContextClient* client = (context->hasServer) ? (context->hasClient ? context->clientPrimServer[p] : context->client) 
-                                                    : context->client;
+      CContextClient* client = context->hasServer ? context->clientPrimServer[p] : context->client;
+
+      storeIndex_client.resize(1);
+      storeIndex_client(0) = 0;
 
       connectedServerRank_[p].clear();
 
-      if (client->isServerLeader())
-      {
-        const std::list<int>& ranks = client->getRanksServerLeader();
-        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-        {
-          int rank = *itRank;
-          int nb = 1;
+      if (0 == client->clientRank)
+      {
+        for (int rank = 0; rank < client->serverSize; ++rank)
+        {
           connectedServerRank_[p].push_back(rank);
-          connectedDataSize_[p][rank] = nb;
-          nbSenders[p][rank] = nb;
-        }
-      }
-      else
-      {
-        const std::list<int>& ranks = client->getRanksServerNotLeader();
-        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-        {
-          int rank = *itRank;
-          int nb = 1;
-          connectedServerRank_[p].push_back(rank);
-          connectedDataSize_[p][rank] = nb;
-          nbSenders[p][rank] = nb;
-        }        
-      }
-
+          connectedDataSize_[p][rank] = 1;
+          nbSenders[p][rank] = 1;
+        }
+      }
       isDataDistributed_ = false;
     }

XIOS/dev/dev_olga/src/node/grid.hpp

@@ -278 +278 @@
         void computeClientIndex();
         void computeConnectedClients();
-        void computeClientIndexScalarGrid();
-        void computeConnectedClientsScalarGrid();        
 
       private:

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

@@ -46 +46 @@
     axisGlobalSize   = axisDest->n_glo.getValue();
 
-    begin = (this->begin.isEmpty()) ?  0 : this->begin.getValue();
-    n     = (this->n.isEmpty()) ?  axisGlobalSize : this->n.getValue();
-    end   = begin+n-1;
+    bool zoomByIndex = !this->index.isEmpty() && (0 != this->index.numElements());
+
+    if (zoomByIndex)
+    {
+      begin = min(this->index);
+      end   = max(this->index);
+      n     = end - begin + 1;
+    }
+    else
+    {
+      begin = (this->begin.isEmpty()) ?  0 : this->begin.getValue();
+      n     = (this->n.isEmpty()) ?  axisGlobalSize : this->n.getValue();
+      end   = begin+n-1;
+    }
 
     if (begin < 0 || begin > axisGlobalSize - 1 || end < 0 || end > axisGlobalSize - 1
@@ -55 +66 @@
             << "One or more attributes among 'begin' (" << begin << "), 'end' (" << end << "), 'n' (" << n << ") "
             << "of axis transformation [ id = '" << axisDest->getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
+    
+    if (zoomByIndex && (!this->begin.isEmpty() || !this->n.isEmpty()))
+      ERROR("CZoomAxis::checkValid(CAxis* axisDest)",
+            << "Only one type of zoom is accepted. Define zoom by index with global_zoom_index or define zoom with begin and n. "
+            << "Axis transformation [ id = '" << axisDest->getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] are not well specified");
 
     this->begin.setValue(begin);