Changeset 2507

Timestamp:

06/01/23 10:58:08 (12 months ago)

Author:

ymipsl

Message:

Merging XIOS3_ATTACHED branch into XIOS3 trunk.

YM

Location:

XIOS3/trunk/src

Files:

• config/domain_attribute.conf (modified) (1 diff)
• config/node_type.conf (modified) (1 diff)
• config/redistribute_axis_attribute.conf (added)
• config/redistribute_domain_attribute.conf (added)
• config/redistribute_scalar_attribute.conf (added)
• distribution/grid_remote_connector.cpp (modified) (2 diffs)
• distribution/transform_connector.hpp (modified) (4 diffs)
• filter/client_online_reader_filter.cpp (added)
• filter/client_online_reader_filter.hpp (added)
• filter/client_online_writer_filter.cpp (added)
• filter/client_online_writer_filter.hpp (added)
• filter/file_writer_store_filter.cpp (modified) (1 diff)
• filter/grid_redistribute_filter.cpp (added)
• filter/grid_redistribute_filter.hpp (added)
• filter/grid_redistribute_filter_in.cpp (added)
• filter/grid_redistribute_filter_in.hpp (added)
• filter/output_pin.hpp (modified) (1 diff)
• generate_fortran_interface.cpp (modified) (4 diffs)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• io/nc4_data_input.cpp (modified) (2 diffs)
• io/nc4_data_output.cpp (modified) (15 diffs)
• manager/services_manager.cpp (modified) (6 diffs)
• mpi_tools.cpp (modified) (1 diff)
• node/axis.cpp (modified) (11 diffs)
• node/axis.hpp (modified) (1 diff)
• node/context.cpp (modified) (14 diffs)
• node/context.hpp (modified) (2 diffs)
• node/domain.cpp (modified) (16 diffs)
• node/domain.hpp (modified) (2 diffs)
• node/field.cpp (modified) (16 diffs)
• node/field.hpp (modified) (9 diffs)
• node/file.cpp (modified) (3 diffs)
• node/file.hpp (modified) (3 diffs)
• node/grid.cpp (modified) (6 diffs)
• node/grid.hpp (modified) (3 diffs)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• node/redistribute_axis.cpp (added)
• node/redistribute_axis.hpp (added)
• node/redistribute_domain.cpp (added)
• node/redistribute_domain.hpp (added)
• node/redistribute_scalar.cpp (added)
• node/redistribute_scalar.hpp (added)
• node/scalar.cpp (modified) (2 diffs)
• node/scalar.hpp (modified) (1 diff)
• object_factory_decl2.cpp (modified) (1 diff)
• object_factory_decl4.cpp (modified) (1 diff)
• object_template_decl.cpp (modified) (2 diffs)
• transformation/algo_types.cpp (modified) (3 diffs)
• transformation/algo_types.hpp (modified) (3 diffs)
• transformation/axis_algorithm/axis_algorithm_extract.cpp (modified) (2 diffs)
• transformation/axis_algorithm/axis_algorithm_inverse.cpp (modified) (2 diffs)
• transformation/axis_algorithm/axis_algorithm_redistribute.cpp (added)
• transformation/axis_algorithm/axis_algorithm_redistribute.hpp (added)
• transformation/axis_algorithm/axis_algorithm_zoom.cpp (modified) (2 diffs)
• transformation/domain_algorithm/domain_algorithm_extract.cpp (modified) (3 diffs)
• transformation/domain_algorithm/domain_algorithm_redistribute.cpp (added)
• transformation/domain_algorithm/domain_algorithm_redistribute.hpp (added)
• transformation/domain_algorithm/domain_algorithm_reorder.cpp (modified) (2 diffs)
• transformation/domain_algorithm/domain_algorithm_zoom.cpp (modified) (2 diffs)
• transformation/scalar_algorithm/scalar_algorithm_extract_axis.cpp (modified) (1 diff)
• transformation/scalar_algorithm/scalar_algorithm_redistribute.cpp (added)
• transformation/scalar_algorithm/scalar_algorithm_redistribute.hpp (added)
• transformation/transformation_enum.hpp (modified) (1 diff)
• transport/context_client.cpp (modified) (3 diffs)
• transport/context_client.hpp (modified) (4 diffs)
• transport/legacy_context_client.cpp (modified) (1 diff)
• transport/legacy_context_client.hpp (modified) (1 diff)
• transport/legacy_context_server.cpp (modified) (2 diffs)
• transport/one_sided_context_client.hpp (modified) (1 diff)
• transport/online_context_client.cpp (added)
• transport/online_context_client.hpp (added)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS3/trunk/src/config/domain_attribute.conf

@@ -62 +62 @@
 
 DECLARE_ARRAY(double, 2, area, false)
+DECLARE_ARRAY(double, 2, area_2d, false)
+DECLARE_ARRAY(double, 1, area_1d, false)
 DECLARE_ATTRIBUTE(double, radius)
 

XIOS3/trunk/src/config/node_type.conf

@@ -132 +132 @@
 #endif //__XIOS_CServiceNode__
 
+#ifdef __XIOS_CRedistributeDomain__
+   DECLARE_NODE(RedistributeDomain, redistribute_domain)
+#endif //__XIOS_CRedistributeDomain__
+
+#ifdef __XIOS_CRedistributeAxis__
+   DECLARE_NODE(RedistributeAxis, redistribute_axis)
+#endif //__XIOS_CRedistributeAxis__
+
+#ifdef __XIOS_CRedistributeScalar__
+   DECLARE_NODE(RedistributeScalar, redistribute_scalar)
+#endif //__XIOS_CRedistributeScalar__
+
 #ifdef __XIOS_CContext__
    DECLARE_NODE_PAR(Context, context)

XIOS3/trunk/src/distribution/grid_remote_connector.cpp

@@ -99 +99 @@
       size_t globalIndexSize = globalIndex.numElements() ;
       
-      size_t allEqual ;
-      MPI_Allreduce(&globalIndexSize, &allEqual, 1, MPI_SIZE_T, MPI_BXOR, localComm_) ;
-      if (allEqual!=0) 
+      size_t minVal,maxVal ;
+      MPI_Allreduce(&globalIndexSize, &minVal, 1, MPI_SIZE_T, MPI_MIN, localComm_) ;
+      MPI_Allreduce(&globalIndexSize, &maxVal, 1, MPI_SIZE_T, MPI_MAX, localComm_) ;
+      if (minVal!=maxVal) 
       {
         isSrcViewDistributed_[i]=true ;
@@ -110 +111 @@
       size_t hashValue=0 ;
       for(size_t ind=0;ind<globalIndexSize;ind++) hashValue += hashGlobalIndex(globalIndex(ind)) ;
-      MPI_Allreduce(&hashValue, &allEqual, 1, MPI_SIZE_T, MPI_BXOR, localComm_) ;
-      if (allEqual!=0) isSrcViewDistributed_[i]=true ;
+      MPI_Allreduce(&hashValue, &minVal, 1, MPI_SIZE_T, MPI_MIN, localComm_) ;
+      MPI_Allreduce(&hashValue, &maxVal, 1, MPI_SIZE_T, MPI_MAX, localComm_) ;
+      if (minVal!=maxVal) isSrcViewDistributed_[i]=true ;
       else isSrcViewDistributed_[i]=false ;
     }

XIOS3/trunk/src/distribution/transform_connector.hpp

@@ -32 +32 @@
    
     public:
+      
+
       template<typename T> 
-      void transfer(int repeat, int sizeT, const CArray<T,1>& dataIn, CArray<T,1>& dataOut)
+      void transfer(int repeat, int sizeT, const CArray<T,1>& dataIn, CArray<T,1>& dataOut, bool useMissingValue, T missingValue)
       {
         map<int,CArray<T,1>> tmpArrayIn ;
@@ -58 +60 @@
         MPI_Waitall(requests.size(), requests.data(),status.data()) ;
         
-        const double nanValue = std::numeric_limits<double>::quiet_NaN();
-        gathererConnector_->transfer(repeat, sizeT , tmpArrayOut, dataOut, nanValue) ;
+        if (useMissingValue) gathererConnector_->transfer(repeat, sizeT , tmpArrayOut, dataOut, missingValue) ;
+        else gathererConnector_->transfer(repeat, sizeT , tmpArrayOut, dataOut) ;
+ //       const double nanValue = std::numeric_limits<double>::quiet_NaN();
+ //       gathererConnector_->transfer(repeat, sizeT , tmpArrayOut, dataOut, nanValue) ;
+      }
+
+      template<typename T> 
+      void transfer(int repeat, int sizeT, const CArray<T,1>& dataIn, CArray<T,1>& dataOut)
+      {
+        T missingValue ;
+        transfer(1, sizeT, dataIn, dataOut, false, missingValue) ;
+      }
+
+      template<typename T> 
+      void transfer(int repeat, int sizeT, const CArray<T,1>& dataIn, CArray<T,1>& dataOut, T missingValue)
+      {
+        transfer(1, sizeT, dataIn, dataOut, true, missingValue) ;
       }
 
@@ -66 +83 @@
       {
         transfer(1, sizeT, dataIn, dataOut) ;
+      }
+
+      template<typename T> 
+      void transfer(int sizeT, const CArray<T,1>& dataIn, CArray<T,1>& dataOut, T missingValue)
+      {
+        transfer(1, sizeT, dataIn, dataOut, missingValue) ;
       }
    
@@ -74 +97 @@
       }
 
+      template<typename T> 
+      void transfer(const CArray<T,1>& dataIn, CArray<T,1>& dataOut, T missingValue)
+      {
+        transfer(1, 1, dataIn, dataOut, missingValue) ;
+      }
+
   };
 

XIOS3/trunk/src/filter/file_writer_store_filter.cpp

@@ -29 +29 @@
     if (!field->prec.isEmpty() && field->prec == 2) hasRounding_ = true ;
     if (!field->default_value.isEmpty()) {hasDefaultValue_=true ; defaultValue_ = field->default_value ;}
+    context->registerFileToWrite(file_) ;
   }
 

XIOS3/trunk/src/filter/output_pin.hpp

@@ -30 +30 @@
        * \param inputSlot the input slot number
        */
-      void connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot);
+      void virtual connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot);
 
       /*!

XIOS3/trunk/src/generate_fortran_interface.cpp

@@ -53 +53 @@
   CDuplicateScalarToAxis duplicateScalarToAxis;
   CReduceScalarToScalar reduceScalarToScalar;
+
+  CRedistributeDomain redistributeDomain ;
+  CRedistributeAxis   redistributeAxis ;
+  CRedistributeScalar redistributeScalar ;
   
   ostringstream oss;
@@ -329 +333 @@
   file.open((path+"ireorder_domain_attr.F90").c_str());
   reorderDomain.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"iredistribute_domain_attr.F90").c_str());
+  redistributeDomain.generateFortranInterface(file);
   file.close();
   
@@ -435 +443 @@
   duplicateScalarToAxis.generateFortranInterface(file);
   file.close();
+
+  file.open((path+"iredistribute_axis_attr.F90").c_str());
+  redistributeAxis.generateFortranInterface(file);
+  file.close();
+
   /*!
     Scalar transformations
@@ -488 +501 @@
   file.close();
 
+  file.open((path+"iredistribute_scalar_attr.F90").c_str());
+  redistributeScalar.generateFortranInterface(file);
+  file.close();
 
 

XIOS3/trunk/src/group_factory_decl.cpp

@@ -50 +50 @@
   macro(CPoolNodeGroup)
   macro(CServiceNodeGroup)
+  macro(CRedistributeDomainGroup)
+  macro(CRedistributeAxisGroup)
+  macro(CRedistributeScalarGroup)
 
 }

XIOS3/trunk/src/group_template_decl.cpp

@@ -39 +39 @@
   macro(PoolNode)
   macro(ServiceNode)
+  macro(RedistributeDomain)
+  macro(RedistributeAxis)
+  macro(RedistributeScalar)
 
 }

XIOS3/trunk/src/io/nc4_data_input.cpp

@@ -81 +81 @@
             if ((domain->type) != CDomain::type_attr::unstructured)
             {
-              start.push_back(domain->jbegin);
-              count.push_back(domain->nj);
+              start.push_back(domain->jbeginValue_);
+              count.push_back(domain->njValue_);
             }
-            start.push_back(domain->ibegin);
-            count.push_back(domain->ni);
+            start.push_back(domain->ibeginValue_);
+            count.push_back(domain->niValue_);
             --idxDomain;
           }
@@ -131 +131 @@
     // Verify the compatibility of dimension of declared grid and real grid in file
     int realGridDim = 1;
-    bool isUnstructuredGrid = ((gridDim < 2) ? false :  SuperClassWriter::isUnstructured(fieldId));
+    bool isUnstructuredGrid = ((gridDim < 2 || domainP.size()==0) ? false :  SuperClassWriter::isUnstructured(fieldId));
     std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId);
     std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId);

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -202 +202 @@
                  else bounds_latid = "bounds_"+latName+appendDomid;
 
-                 SuperClassWriter::addDimension(dimXid, domain->ni);
-                 SuperClassWriter::addDimension(dimYid, domain->nj);
+                 SuperClassWriter::addDimension(dimXid, domain->niValue_);
+                 SuperClassWriter::addDimension(dimYid, domain->njValue_);
 
                  if (domain->hasBounds)
@@ -210 +210 @@
                  if (context->intraCommSize_ > 1)
                  {
-                   this->writeLocalAttributes(domain->ibegin,
-                                              domain->ni,
-                                              domain->jbegin,
-                                              domain->nj,
+                   this->writeLocalAttributes(domain->ibeginValue_,
+                                              domain->niValue_,
+                                              domain->jbeginValue_,
+                                              domain->njValue_,
                                               appendDomid);
 
                    if (singleDomain)
                     this->writeLocalAttributes_IOIPSL(dimXid, dimYid,
-                                                      domain->ibegin,
-                                                      domain->ni,
-                                                      domain->jbegin,
-                                                      domain->nj,
+                                                      domain->ibeginValue_,
+                                                      domain->niValue_,
+                                                      domain->jbeginValue_,
+                                                      domain->njValue_,
                                                       domain->ni_glo,domain->nj_glo,
                                                       context->intraCommRank_,context->intraCommSize_);
@@ -373 +373 @@
                      std::vector<StdSize> start(2) ;
                      std::vector<StdSize> count(2) ;
-                     start[1]=domain->ibegin;
-                     start[0]=domain->jbegin;
-                     count[1]=domain->ni ; count[0]=domain->nj ;
+                     start[1]=domain->ibeginValue_;
+                     start[0]=domain->jbeginValue_;
+                     count[1]=domain->niValue_ ; count[0]=domain->njValue_ ;
 
                      if (domain->hasLonLat)
@@ -391 +391 @@
                        std::vector<StdSize> count(1) ;
                        
-                       start[0]=domain->jbegin;
-                       count[0]=domain->nj;
+                       start[0]=domain->jbeginValue_;
+                       count[0]=domain->njValue_;
                        CArray<double,1> lat;
-                       lat.resize( domain->nj.getValue() );
-                       for (int j=0;j<domain->nj.getValue();j++) lat(j) = domain->latvalue(j*domain->ni.getValue());
+                       lat.resize( domain->njValue_);
+                       for (int j=0;j<domain->njValue_;j++) lat(j) = domain->latvalue(j*domain->niValue_);
                        SuperClassWriter::writeData(CArray<double,1>(lat.copy()), latid, isCollective, 0,&start,&count);
 
-                       start[0]=domain->ibegin;
-                       count[0]=domain->ni;
-                       CArray<double,1> lon = domain->lonvalue(Range(0,domain->ni-1));
+                       start[0]=domain->ibeginValue_;
+                       count[0]=domain->niValue_;
+                       CArray<double,1> lon = domain->lonvalue(Range(0,domain->niValue_-1));
                        SuperClassWriter::writeData(CArray<double,1>(lon.copy()), lonid, isCollective, 0,&start,&count);
                      }
@@ -419 +419 @@
                    {
                      start[2] = 0;
-                     start[1] = domain->ibegin;
-                     start[0] = domain->jbegin;
+                     start[1] = domain->ibeginValue_;
+                     start[0] = domain->jbeginValue_;
                      count[2] = domain->nvertex;
-                     count[1] = domain->ni;
-                     count[0] = domain->nj;
+                     count[1] = domain->niValue_;
+                     count[0] = domain->njValue_;
                    }
                  
@@ -435 +435 @@
                    std::vector<StdSize> count(2);
 
-                   start[1] = domain->ibegin;
-                   start[0] = domain->jbegin;
-                   count[1] = domain->ni;
-                   count[0] = domain->nj;
+                   start[1] = domain->ibeginValue_;
+                   start[0] = domain->jbeginValue_;
+                   count[1] = domain->niValue_;
+                   count[0] = domain->njValue_;
                    
                    SuperClassWriter::writeData(domain->areavalue, areaId, isCollective, 0, &start, &count);
@@ -703 +703 @@
                else
                {
-                 startNodes[0] = domain->ibegin;
-                 countNodes[0] = domain->ni ;
+                 startNodes[0] = domain->ibeginValue_;
+                 countNodes[0] = domain->niValue_ ;
                }
 
@@ -726 +726 @@
                else
                {
-                 startEdges[0] = domain->ibegin;
-                 countEdges[0] = domain->ni;
+                 startEdges[0] = domain->ibeginValue_;
+                 countEdges[0] = domain->niValue_;
                  startNodes[0] = domain->mesh->node_start;
                  countNodes[0] = domain->mesh->node_count;
                  if (countNodes[0]==0) startNodes[0]=0 ; // for netcdf error
-                 startEdgeNodes[0] = domain->ibegin;
+                 startEdgeNodes[0] = domain->ibeginValue_;
                  startEdgeNodes[1] = 0;
-                 countEdgeNodes[0] = domain->ni;
+                 countEdgeNodes[0] = domain->niValue_;
                  countEdgeNodes[1] = 2;
                }
@@ -763 +763 @@
                else
                {
-                 startFaces[0] = domain->ibegin;
-                 countFaces[0] = domain->ni ;
+                 startFaces[0] = domain->ibeginValue_;
+                 countFaces[0] = domain->niValue_ ;
                  startNodes[0] = domain->mesh->node_start;
                  countNodes[0] = domain->mesh->node_count;
@@ -785 +785 @@
                  countEdgeFaces[1]= 2;
                  
-                 startFaceConctv[0] = domain->ibegin;
-                 countFaceConctv[0] = domain->ni;
+                 startFaceConctv[0] = domain->ibeginValue_;
+                 countFaceConctv[0] = domain->niValue_;
                  startFaceConctv[1] = 0;
                  countFaceConctv[1] = domain->nvertex;
@@ -998 +998 @@
                  else
                  {
-                   start[0]=domain->ibegin;
-                   count[0]=domain->ni;
-                   startBounds[0]=domain->ibegin;
+                   start[0]=domain->ibeginValue_;
+                   count[0]=domain->niValue_;
+                   startBounds[0]=domain->ibeginValue_;
                    startBounds[1]=0 ;
-                   countBounds[0]=domain->ni;
+                   countBounds[0]=domain->niValue_;
                    countBounds[1]=nvertex ;
                  }
@@ -1110 +1110 @@
           if (!axis->label.isEmpty() && !SuperClassWriter::dimExist(strId)) SuperClassWriter::addDimension(strId, stringArrayLen);
 
-          if (axis->hasValue || !axis->label.isEmpty())
+          if (axis->hasValue() || !axis->label.isEmpty())
           {
             if (!axis->label.isEmpty()) dims.push_back(strId);
@@ -1499 +1499 @@
               }
 
-              firstGlobalIndex = domain->ibegin + domain->jbegin * domain->ni_glo;
+              firstGlobalIndex = domain->ibeginValue_ + domain->jbeginValue_ * domain->ni_glo;
 
               domain->addRelFileCompressed(this->filename);
@@ -2323 +2323 @@
                         if ((domain->type) != CDomain::type_attr::unstructured)
                         {
-                          start.push_back(domain->jbegin);
-                          count.push_back(domain->nj);
+                          start.push_back(domain->jbeginValue_);
+                          count.push_back(domain->njValue_);
                         }
                         --idx;
-                        start.push_back(domain->ibegin);
-                        count.push_back(domain->ni);
+                        start.push_back(domain->ibeginValue_);
+                        count.push_back(domain->niValue_);
                         --idx;
                       }
@@ -2383 +2383 @@
                       if ((domain->type) != CDomain::type_attr::unstructured)
                       {
-                        start.push_back(domain->jbegin);
-                        count.push_back(domain->nj);
+                        start.push_back(domain->jbeginValue_);
+                        count.push_back(domain->njValue_);
                       }
                       --idx ;
 
-                        start.push_back(domain->ibegin);
-                        count.push_back(domain->ni);
+                        start.push_back(domain->ibeginValue_);
+                        count.push_back(domain->niValue_);
                       --idx ;
                       --idxDomain;

XIOS3/trunk/src/manager/services_manager.cpp

@@ -227 +227 @@
     int leader ;
 
-    services_.clear() ;
     int nbServices ;
     buffer>>nbServices ;
+    bool newServices = nbServices != services_.size() ; 
+
+    services_.clear() ;
 
     for(int i=0;i<nbServices;i++) 
@@ -235 +237 @@
       buffer>>poolId>>serviceId>>partitionId>>type>>size>>nbPartitions>>leader ;
       services_[std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)]=std::make_tuple(type,size,nbPartitions,leader) ;
+      if (newServices)
+        info(40)<<"Receive new services informations : "<<poolId<<"::"<<serviceId<<"::"<<partitionId<<" => type : "<<type<<"  size : "<<size<<"  nbPartitions : "<<nbPartitions<<"  leader : "<<leader<<endl ;
     }
   }
@@ -256 +260 @@
                                         int& size, int& nbPartitions, int& leader, bool wait)
   {
-    
     winServices_->lockWindowShared(managerGlobalLeader_) ;
     winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
     winServices_->unlockWindow(managerGlobalLeader_) ;
-
+    
+    if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
     auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
-    if ( it == services_.end() && !wait) return false ;
+    if ( it == services_.end()) return false ;
     else
     {
-      if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
       type= std::get<0>(it->second); 
       size= std::get<1>(it->second); 
@@ -279 +282 @@
     int size ;
     int nbPartitions;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -288 +290 @@
     int nbPartitions;
     int leader;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -297 +298 @@
     int type;
     int leader;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
   bool CServicesManager::hasService(const std::string& poolId, const std::string& serviceId, const int& partitionId)
   {
-    winServices_->lockWindow(managerGlobalLeader_,0) ;
-    winServices_->updateFromWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    winServices_->unlockWindow(managerGlobalLeader_,0) ;
+    winServices_->lockWindowShared(managerGlobalLeader_) ;
+    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
+    winServices_->unlockWindow(managerGlobalLeader_) ;
     auto it=services_.find(std::tuple<std::string, std::string, int>(poolId, serviceId, partitionId)) ;
     if ( it == services_.end()) return false ;

XIOS3/trunk/src/mpi_tools.cpp

@@ -28 +28 @@
 
   template<>
+  MPI_Datatype MPI_GetType<bool>(void) { return MPI_CXX_BOOL ;}
+
+  template<>
   MPI_Datatype MPI_GetType<char>(void) { return MPI_CHAR ;}
 

XIOS3/trunk/src/node/axis.cpp

@@ -24 +24 @@
       : CObjectTemplate<CAxis>()
       , CAxisAttributes(), isChecked(false), relFiles()
-      , hasBounds(false), isCompressible_(false)
-      , transformationMap_(), hasValue(false), hasLabel(false)
+      , hasBounds_(false), isCompressible_(false)
+      , transformationMap_()
       , clients()
    {
@@ -33 +33 @@
       : CObjectTemplate<CAxis>(id)
       , CAxisAttributes(), isChecked(false), relFiles()
-      , hasBounds(false), isCompressible_(false)
-      , transformationMap_(), hasValue(false), hasLabel(false)
+      , hasBounds_(false), isCompressible_(false)
+      , transformationMap_()
       , clients()
    {
@@ -56 +56 @@
      m["temporal_splitting"] = TRANS_TEMPORAL_SPLITTING;
      m["duplicate_scalar"] = TRANS_DUPLICATE_SCALAR_TO_AXIS;
+     m["redistribute_axis"] = TRANS_REDISTRIBUTE_AXIS;
+
      return true;
    }
@@ -165 +167 @@
          size += CArray<bool,1>::size(n_glo);
          size += CArray<double,1>::size(n_glo);
-         if (hasBounds)
+         if (hasBounds_)
            size += CArray<double,2>::size(2*n_glo);
-         if (hasLabel)
+         if (hasLabel_)
           size += CArray<StdString,1>::size(n_glo);
        }
@@ -198 +200 @@
          size += CArray<bool,1>::size(it->second.size());
          size += CArray<double,1>::size(it->second.size());
-         if (hasBounds)
+         if (hasBounds_)
            size += CArray<double,2>::size(2 * it->second.size());
-         if (hasLabel)
+         if (hasLabel_)
            size += CArray<StdString,1>::size(it->second.size());
 
@@ -457 +459 @@
                                    << ") than the one defined by the \'size\' attribute (" << n.getValue() << ").")
           else return false ; 
-        this->hasValue = true;
+        this->hasValue_ = true;
       }
 
@@ -567 +569 @@
                                << "Bounds size is "<< bounds.extent(0) << " x " << bounds.extent(1) << ".")
          else return false ;
-       hasBounds = true;
-     }
-     else hasBounds = false;
+       hasBounds_ = true;
+     }
+     else hasBounds_ = false;
      return true ;
    }
@@ -585 +587 @@
                               << "label size is "<< label.extent(0)<<  " .")
         else return false ;
-      hasLabel = true;
-    }
-    else hasLabel = false;
+      hasLabel_ = true;
+    }
+    else hasLabel_ = false;
     return true ;
   }
@@ -1163 +1165 @@
     CContext* context = CContext::getCurrent();
 
-    if (hasValue)
+    if (hasValue_)
     {
       { // send level value
@@ -1173 +1175 @@
     }
 
-    if (hasBounds)
+    if (hasBounds_)
     {
       { // send bounds level value
@@ -1183 +1185 @@
     }
 
-    if (hasLabel)
+    if (hasLabel_)
     {
       { // send label

XIOS3/trunk/src/node/axis.hpp

@@ -175 +175 @@
          bool isEqual(CAxis* axis);
 
-      public: 
-        bool hasValue;        
-        bool hasBounds;
-        bool hasLabel;
+      private: 
+        bool hasValue_= false;        
+        bool hasBounds_= false;
+        bool hasLabel_= false;
+      public:
+        bool hasValue(void) { return hasValue_ ;}
+        bool hasBounds(void) { return hasBounds_ ;}
+        bool hasLabel(void) { return hasLabel_ ;}
 
       private:

XIOS3/trunk/src/node/context.cpp

@@ -7 +7 @@
 #include "duration.hpp"
 
+#include "online_context_client.hpp"
 #include "legacy_context_client.hpp"
 #include "legacy_context_server.hpp"
@@ -662 +663 @@
       
       int serviceType ;
-      //if (intraCommRank_==0) CXios::getServicesManager()->getServiceType(poolId, serviceId, 0, serviceType, true) ;
-      if (intraCommRank_==0) CXios::getServicesManager()->getServiceType(poolId, serviceId, 0, serviceType) ;
+      if (intraCommRank_==0) CXios::getServicesManager()->getServiceType(poolId, serviceId, 0, serviceType, true) ;
       MPI_Bcast(&serviceType,1,MPI_INT,0,intraComm_) ;
       
@@ -679 +679 @@
   vector<CContextClient*> CContext::getContextClient(const string& poolId, const string& serviceId)
   {
-    vector<pair<CContextClient*,CContextServer*>> clientServers ;
-    getServerInterComm(poolId, serviceId, clientServers ) ;
-    vector<CContextClient*> ret ;
-    for(auto& clientServer : clientServers) ret.push_back(clientServer.first) ;
+     vector<CContextClient*> ret ;
+    
+    if (serviceId=="attached") ret.push_back(onlineContextClient_) ;
+    else
+    {
+      vector<pair<CContextClient*,CContextServer*>> clientServers ;
+      getServerInterComm(poolId, serviceId, clientServers ) ;
+      for(auto& clientServer : clientServers) ret.push_back(clientServer.first) ;
+    }
     return ret ;
   }
@@ -808 +813 @@
       if (serviceType_==CServicesManager::CLIENT)
       {
-//ym        doPreTimestepOperationsForEnabledReadModeFiles(); // For now we only use server level 1 to read data
         triggerLateFields() ;
 
@@ -986 +990 @@
 
      CTimer::get("Context : close definition").resume() ;
+
+     onlineContextClient_=CContextClient::getNew<CContextClient::online>(this,intraComm_, intraComm_);
           
      // create intercommunicator with servers. 
@@ -1146 +1152 @@
     {
       for(auto field : fileInField) 
-      {
-        field->sendFieldToInputFileServer() ;
-        field->connectToServerInput(garbageCollector) ; // connect the field to server filter
+        if (field->getContextClient()->getType() != CContextClient::online) field->sendFieldToInputFileServer() ;
+
+      for(auto field : fileInField) 
+      {
+        if (field->getContextClient()->getType() == CContextClient::online) field->connectToOnlineReader(garbageCollector) ;
+        else field->connectToServerInput(garbageCollector) ; // connect the field to server filter
         fileInFields_.push_back(field) ;
       }
@@ -1158 +1167 @@
       for(auto field : fileOutField) 
       {
-        field->connectToFileServer(garbageCollector) ; // connect the field to server filter
-      }
-      for(auto field : fileOutField) field->sendFieldToFileServer() ;
+        if (field->getContextClient()->getType() == CContextClient::online)  field->connectToOnlineWriter(garbageCollector) ;
+        else  field->connectToFileServer(garbageCollector) ; // connect the field to server filter
+      }
+      for(auto field : fileOutField) 
+        if (field->getContextClient()->getType() != CContextClient::online) field->sendFieldToFileServer() ;
     }
 
@@ -1177 +1188 @@
       for(auto field : fileInField) 
       {
-        field->connectToServerToClient(garbageCollector) ;
+        if (field->getContextClient()->getType() == CContextClient::online) field->connectToOnlineReader(garbageCollector) ;
+        else field->connectToServerToClient(garbageCollector) ;
       }
     }
@@ -1232 +1244 @@
     if (serviceType_==CServicesManager::CLIENT) 
     {
-      for(auto field : fileOutField) slaves[clientsId_[field->getContextClient()]] = field->getContextClient() ; 
-      for(auto field : fileInField) slaves[clientsId_[field->getContextClient()]] = field->getContextClient() ; 
+      for(auto field : fileOutField)
+        if (field->getContextClient()->getType()!=CContextClient::online)  slaves[clientsId_[field->getContextClient()]] = field->getContextClient() ; 
+      for(auto field : fileInField) 
+        if (field->getContextClient()->getType()!=CContextClient::online)  slaves[clientsId_[field->getContextClient()]] = field->getContextClient() ; 
     }
     else if (serviceType_==CServicesManager::GATHERER) 
@@ -1242 +1256 @@
     for(auto& slaveServer : slaveServers_) sendCloseDefinition(slaveServer) ;
 
-    if (serviceType_==CServicesManager::WRITER)  
-    {
-      createFileHeader();
-    }
-
-    if (serviceType_==CServicesManager::CLIENT) startPrefetchingOfEnabledReadModeFiles();
+    createFileHeader();
+   
+    //if (serviceType_==CServicesManager::CLIENT) startPrefetchingOfEnabledReadModeFiles();
+    if (serviceType_==CServicesManager::CLIENT) 
+       for(auto field : fileInField) field->sendReadDataRequest(getCalendar()->getCurrentDate());  
    
     // send signal to couplerIn context that definition phasis is done
@@ -1356 +1369 @@
    CATCH_DUMP_ATTR
 
-
-   void CContext::postProcessFilterGraph()
-   TRY
-   {
-     int size = enabledFiles.size();
-     for (int i = 0; i < size; ++i)
-     {
-        enabledFiles[i]->postProcessFilterGraph();
-     }
-   }
-   CATCH_DUMP_ATTR
-
    void CContext::startPrefetchingOfEnabledReadModeFiles()
    TRY
@@ -1375 +1376 @@
      {
         enabledReadModeFiles[i]->prefetchEnabledReadModeFields();
-     }
-   }
-   CATCH_DUMP_ATTR
-
-   void CContext::doPreTimestepOperationsForEnabledReadModeFiles()
-   TRY
-   {
-     int size = enabledReadModeFiles.size();
-     for (int i = 0; i < size; ++i)
-     {
-        enabledReadModeFiles[i]->doPreTimestepOperationsForEnabledReadModeFields();
      }
    }
@@ -2177 +2167 @@
         if (serviceType_==CServicesManager::CLIENT) // For now we only use server level 1 to read data
         {
-          doPostTimestepOperationsForEnabledReadModeFiles();
+         // doPostTimestepOperationsForEnabledReadModeFiles();
+          for(auto& field : fileInFields_) field->sendReadDataRequestIfNeeded() ;
           garbageCollector.invalidate(calendar->getCurrentDate());
         }
@@ -2202 +2193 @@
    CATCH_DUMP_ATTR
 
-   //! Server side: Create header of netcdf file
+   //! Create header of netcdf file
    void CContext::createFileHeader(void)
    TRY
    {
-      vector<CFile*>::const_iterator it;
-
-      //for (it=enabledFiles.begin(); it != enabledFiles.end(); it++)
-      for (it=enabledWriteModeFiles.begin(); it != enabledWriteModeFiles.end(); it++)
-      {
-         (*it)->initWrite();
-      }
+      for(auto& file : filesToWrite_) file->initWrite();
    }
    CATCH_DUMP_ATTR

XIOS3/trunk/src/node/context.hpp

@@ -141 +141 @@
          void initReadFiles(void);
          void prepareTimeseries(void);
-         void postProcessFilterGraph();
          void startPrefetchingOfEnabledReadModeFiles();
-         void doPreTimestepOperationsForEnabledReadModeFiles();
          void doPostTimestepOperationsForEnabledReadModeFiles();
          void findFieldsWithReadAccess(void);
@@ -298 +296 @@
          // Determine context on server or not
          bool hasServer;
-
+      public:
+        void registerFileToWrite(CFile* file) { filesToWrite_.insert(file); } // Add a file that need to be write for example to create headers
+      private:  
+        std::set<CFile*> filesToWrite_ ;  
 
       private:
+        CContextClient* onlineContextClient_=nullptr ;
+        
         std::string defaultPoolWriterId_ ;
         std::string defaultPoolReaderId_ ;

XIOS3/trunk/src/node/domain.cpp

@@ -293 +293 @@
     \param [in] nbLocalDomain number of local domain on the domain destination
    */
+
    void CDomain::redistribute(int nbLocalDomain)
    TRY
@@ -862 +863 @@
         
 
-        if (!area.isEmpty()) area.transposeSelf(1, 0); // => to be checked why is it transposed
+//        if (!area.isEmpty()) area.transposeSelf(1, 0); // => to be checked why is it transposed
      }
 
@@ -914 +915 @@
    CATCH_DUMP_ATTR
 
+   void CDomain::compute2dBox(void)
+   {
+     if (i_index.numElements()==0)
+     {
+       ibeginValue_= 0 ;
+       jbeginValue_= 0 ;
+       niValue_= 0 ;
+       njValue_= 0 ;
+     }
+     else
+     {
+       int maxI=0 ;
+       int maxJ=0 ;
+       int minI=nj_glo*ni_glo ;
+       int minJ=nj_glo*ni_glo ;
+       int i,j,k,ij ;
+       for(int k=0; k<i_index.numElements(); k++)
+       {
+         ij=j_index(k)*ni_glo + i_index(k) ;
+         i=ij%ni_glo ;
+         j=ij/ni_glo ;
+         if (i<minI) minI=i;
+         if (j<minJ) minJ=j;
+         if (i>maxI) maxI=i;
+         if (j>maxJ) maxJ=j;
+       }
+       ibeginValue_=minI ;
+       jbeginValue_=minJ ;
+       niValue_=maxI-minI+1 ;
+       njValue_=maxJ-minJ+1 ;
+     }
+   }
+
    size_t CDomain::getGlobalWrittenSize(void)
    {
@@ -943 +977 @@
         {          
          // No information about ni
-          int minIndex = ni_glo - 1;
+          int minIndex = ni_glo*nj_glo - 1;
           int maxIndex = 0;
           for (int idx = 0; idx < i_index.numElements(); ++idx)
@@ -950 +984 @@
             if (i_index(idx) > maxIndex) maxIndex = i_index(idx);
           }
-          if (i_index.numElements()) {
+                if (i_index.numElements())
+          {
             ni = maxIndex - minIndex + 1; 
             minIIndex = minIndex;
           }         
-          else {
-            ni = 0;
-          }
-        }
+                else ni = 0;
+              }
 
         // It's not so correct but if ibegin is not the first value of i_index 
@@ -1010 +1043 @@
         {
           // No information about nj
-          int minIndex = nj_glo - 1;
+          int minIndex = ni_glo*nj_glo - 1;
           int maxIndex = 0;
           for (int idx = 0; idx < j_index.numElements(); ++idx)
@@ -1354 +1387 @@
      }
      else if (!lonvalue_1d.isEmpty()  && !lonlatValueExisted)
+     {
+       if (type_attr::rectilinear == type)
+       {
+         if (ni == lonvalue_1d.numElements() && nj == latvalue_1d.numElements())
+         {
+           lonvalue.resize(ni * nj);
+           latvalue.resize(ni * nj);
+           if (hasBounds)
+           {
+             bounds_lonvalue.resize(nvertex, ni * nj);
+             bounds_latvalue.resize(nvertex, ni * nj);
+           }
+
+           for (int j = 0; j < nj; ++j)
+           {
+             for (int i = 0; i < ni; ++i)
+             {
+               int k = j * ni + i;
+
+               lonvalue(k) = lonvalue_1d(i);
+               latvalue(k) = latvalue_1d(j);
+
+               if (hasBounds)
+               {
+                 for (int n = 0; n < nvertex; ++n)
+                 {
+                   bounds_lonvalue(n,k) = bounds_lon_1d(n,i);
+                   bounds_latvalue(n,k) = bounds_lat_1d(n,j);
+                 }
+               }
+             }
+           }
+         }
+         else if (i_index.numElements() == lonvalue_1d.numElements() && j_index.numElements() == latvalue_1d.numElements()  && !lonlatValueExisted)
+         {
+           lonvalue.reference(lonvalue_1d.copy());
+           latvalue.reference(latvalue_1d.copy());
+           if (hasBounds)
+           {
+             bounds_lonvalue.reference(bounds_lon_1d.copy());
+             bounds_latvalue.reference(bounds_lat_1d.copy());
+           }
+         }
+         else
+           ERROR("CDomain::completeLonClient(void)",
+                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
+                 << "'lonvalue_1d' and 'latvalue_1d' does not have the same size as the local domain." << std::endl
+                 << "'lonvalue_1d' size is " << lonvalue_1d.numElements() 
+                 << " and 'latvalue_1d' size is " << latvalue_1d.numElements() << std::endl 
+                 << " They should be correspondingly " << ni.getValue() << " and "  << nj.getValue() << " or " << std::endl
+                 << i_index.numElements() << " and "  << j_index.numElements() << ".");
+       }
+       else if (type == type_attr::curvilinear || type == type_attr::unstructured  && !lonlatValueExisted)
+       {
+         lonvalue.reference(lonvalue_1d.copy());
+         latvalue.reference(latvalue_1d.copy());
+         if (hasBounds)
+         {
+           bounds_lonvalue.reference(bounds_lon_1d.copy());
+           bounds_latvalue.reference(bounds_lat_1d.copy());
+         }
+       }
+     }
+
+     if (!area_2d.isEmpty() && areavalue.isEmpty())
+     {
+       areavalue.resize(ni*nj);
+       for (int j = 0; j < nj; ++j)
+       {
+         for (int i = 0; i < ni; ++i)
+         {
+           int k = j * ni + i;
+           areavalue(k) = area_2d(i,j);
+         }
+       }
+     }
+     else if (!area_1d.isEmpty() && areavalue.isEmpty()) areavalue.reference(area_1d.copy());
+
+   }
+   CATCH_DUMP_ATTR
+
+   /*
+     Convert internal longitude latitude value used by XIOS to "lonvalue_*" which can be retrieved with Fortran interface
+   */
+   void CDomain::convertLonLatValue(void)
+   TRY
+   {
+     bool lonlatValueExisted = (0 != lonvalue.numElements()) || (0 != latvalue.numElements());
+     if (!lonvalue_2d.isEmpty() && lonlatValueExisted)
+     {
+       lonvalue_2d.resize(ni,nj);
+       latvalue_2d.resize(ni,nj);
+       if (hasBounds)
+       {
+         bounds_lon_2d.resize(nvertex, ni, nj);
+         bounds_lat_2d.resize(nvertex, ni, nj);
+       }
+
+       for (int j = 0; j < nj; ++j)
+       {
+         for (int i = 0; i < ni; ++i)
+         {
+           int k = j * ni + i;
+
+           lonvalue_2d(i,j) = lonvalue(k);
+           latvalue_2d(i,j) = latvalue(k);
+
+           if (hasBounds)
+           {
+             for (int n = 0; n < nvertex; ++n)
+             {
+               bounds_lon_2d(n,i,j) = bounds_lonvalue(n,k);
+               bounds_lat_2d(n,i,j) = bounds_latvalue(n,k);
+             }
+           }
+         }
+       }
+     }
+     else if (!lonvalue_1d.isEmpty()  && lonlatValueExisted)
      {
        if (type_attr::rectilinear == type)
@@ -1417 +1569 @@
        }
      }
-
-     if (!area.isEmpty() && areavalue.isEmpty())
-     {
-        areavalue.resize(ni*nj);
-       for (int j = 0; j < nj; ++j)
-       {
-         for (int i = 0; i < ni; ++i)
-         {
-           int k = j * ni + i;
-           areavalue(k) = area(i,j);
-         }
-       }
-     }
-   }
-   CATCH_DUMP_ATTR
-
-   /*
-     Convert internal longitude latitude value used by XIOS to "lonvalue_*" which can be retrieved with Fortran interface
-   */
-   void CDomain::convertLonLatValue(void)
-   TRY
-   {
-     bool lonlatValueExisted = (0 != lonvalue.numElements()) || (0 != latvalue.numElements());
-     if (!lonvalue_2d.isEmpty() && lonlatValueExisted)
-     {
-       lonvalue_2d.resize(ni,nj);
-       latvalue_2d.resize(ni,nj);
-       if (hasBounds)
-       {
-         bounds_lon_2d.resize(nvertex, ni, nj);
-         bounds_lat_2d.resize(nvertex, ni, nj);
-       }
-
-       for (int j = 0; j < nj; ++j)
-       {
-         for (int i = 0; i < ni; ++i)
-         {
-           int k = j * ni + i;
-
-           lonvalue_2d(i,j) = lonvalue(k);
-           latvalue_2d(i,j) = latvalue(k);
-
-           if (hasBounds)
-           {
-             for (int n = 0; n < nvertex; ++n)
-             {
-               bounds_lon_2d(n,i,j) = bounds_lonvalue(n,k);
-               bounds_lat_2d(n,i,j) = bounds_latvalue(n,k);
-             }
-           }
-         }
-       }
-     }
-     else if (!lonvalue_1d.isEmpty()  && lonlatValueExisted)
-     {
-       if (type_attr::rectilinear == type)
-       {
-         if (ni == lonvalue_1d.numElements() && nj == latvalue_1d.numElements())
-         {
-           lonvalue.resize(ni * nj);
-           latvalue.resize(ni * nj);
-           if (hasBounds)
-           {
-             bounds_lonvalue.resize(nvertex, ni * nj);
-             bounds_latvalue.resize(nvertex, ni * nj);
-           }
-
-           for (int j = 0; j < nj; ++j)
-           {
-             for (int i = 0; i < ni; ++i)
-             {
-               int k = j * ni + i;
-
-               lonvalue(k) = lonvalue_1d(i);
-               latvalue(k) = latvalue_1d(j);
-
-               if (hasBounds)
-               {
-                 for (int n = 0; n < nvertex; ++n)
-                 {
-                   bounds_lonvalue(n,k) = bounds_lon_1d(n,i);
-                   bounds_latvalue(n,k) = bounds_lat_1d(n,j);
-                 }
-               }
-             }
-           }
-         }
-         else if (i_index.numElements() == lonvalue_1d.numElements() && j_index.numElements() == latvalue_1d.numElements()  && !lonlatValueExisted)
-         {
-           lonvalue.reference(lonvalue_1d);
-           latvalue.reference(latvalue_1d);
-            if (hasBounds)
-           {
-             bounds_lonvalue.reference(bounds_lon_1d);
-             bounds_latvalue.reference(bounds_lat_1d);
-           }
-         }
-         else
-           ERROR("CDomain::completeLonClient(void)",
-                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
-                 << "'lonvalue_1d' and 'latvalue_1d' does not have the same size as the local domain." << std::endl
-                 << "'lonvalue_1d' size is " << lonvalue_1d.numElements() 
-                 << " and 'latvalue_1d' size is " << latvalue_1d.numElements() << std::endl 
-                 << " They should be correspondingly " << ni.getValue() << " and "  << nj.getValue() << " or " << std::endl
-                 << i_index.numElements() << " and "  << j_index.numElements() << ".");
-       }
-       else if (type == type_attr::curvilinear || type == type_attr::unstructured  && !lonlatValueExisted)
-       {
-         lonvalue.reference(lonvalue_1d);
-         latvalue.reference(latvalue_1d);
-         if (hasBounds)
-         {
-           bounds_lonvalue.reference(bounds_lon_1d);
-           bounds_latvalue.reference(bounds_lat_1d);
-         }
-       }
-     }
    }
    CATCH_DUMP_ATTR
@@ -1636 +1671 @@
    {
      bool hasAreaValue = (!areavalue.isEmpty() && 0 != areavalue.numElements());
-     hasArea = !area.isEmpty();
+     hasArea = !area_1d.isEmpty() || !area_2d.isEmpty();
      if (hasArea && !hasAreaValue)
      {
-       if (area.extent(0) != ni || area.extent(1) != nj)
+       if (!area_2d.isEmpty() && (area_2d.extent(0) != ni || area_2d.extent(1) != nj))
        {
          ERROR("CDomain::checkArea(void)",
@@ -1645 +1680 @@
                << "The area does not have the same size as the local domain." << std::endl
                << "Local size is " << ni.getValue() << " x " << nj.getValue() << "." << std::endl
-               << "Area size is " << area.extent(0) << " x " << area.extent(1) << ".");
-       }
-//       if (areavalue.isEmpty())
-//       {
-//          areavalue.resize(ni*nj);
-//         for (int j = 0; j < nj; ++j)
-//         {
-//           for (int i = 0; i < ni; ++i)
-//           {
-//             int k = j * ni + i;
-//             areavalue(k) = area(i,j);
-//           }
-//         }
-//       }
+               << "Area size is " << area_2d.extent(0) << " x " << area_2d.extent(1) << ".");
+       }
+       
+       if (!area_1d.isEmpty() && area_1d.extent(0) != ni*nj)
+       {
+         ERROR("CDomain::checkArea(void)",
+               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
+               << "The area does not have the same size as the local domain." << std::endl
+               << "Local size is " << ni.getValue() << " x " << nj.getValue() << "." << std::endl
+               << "Area size is " << area_1d.extent(0) << " but must be ni*nj=" << ni*nj << " .");
+       }
+
      }
    }
@@ -1731 +1764 @@
       if (this->checkAttributes_done_) return;
       this->checkDomain();
+      this->compute2dBox() ;
       this->checkLonLat();
       this->checkBounds();
@@ -1803 +1837 @@
      excludedAttr.insert(excludedAttr.end(), { "mask_1d", "mask_2d" }); // ???
      excludedAttr.insert(excludedAttr.end(), { "bounds_lon_1d", "bounds_lat_1d", "bounds_lon_2d", "bounds_lat_2d" });
-     excludedAttr.insert(excludedAttr.end(), { "area" });
+     excludedAttr.insert(excludedAttr.end(), { "area_1d", "area_2d" });
      // private
      excludedAttr.insert(excludedAttr.end(), { "lon_start", "lon_end", "lat_start", "lat_end" });
@@ -1952 +1986 @@
     CContext* context = CContext::getCurrent();
     map<int, CArray<size_t,1>> globalIndex ;
-/* old method
-    if (type==EDistributionType::BANDS) // Bands distribution to send to file server
-    {
-      int nbServer = client->getRemoteSize();
-      std::vector<int> nGlobDomain(2);
-      nGlobDomain[0] = this->ni_glo;
-      nGlobDomain[1] = this->nj_glo;
-
-      // to be changed in future, need to rewrite more simply domain distribution
-      CServerDistributionDescription serverDescription(nGlobDomain, nbServer);
-      int distributedPosition ;
-      if (isUnstructed_) distributedPosition = 0 ;
-      else distributedPosition = 1 ;
-      
-      std::vector<std::vector<int> > serverIndexBegin = serverDescription.getServerIndexBegin();
-      std::vector<std::vector<int> > serverDimensionSizes = serverDescription.getServerDimensionSizes();
-      vector<unordered_map<size_t,vector<int>>> indexServerOnElement ;
-      CArray<int,1> axisDomainOrder(1) ; axisDomainOrder(0)=2 ;
-      auto zeroIndex=serverDescription.computeServerGlobalByElement(indexServerOnElement, context->getIntraCommRank(), context->getIntraCommSize(),
-                                                                  axisDomainOrder,distributedPosition) ;
-      // distribution is very bad => to redo
-      // convert indexServerOnElement => map<int,CArray<size_t,1>> - need to be changed later
-      map<int, vector<size_t>> vectGlobalIndex ;
-      for(auto& indexRanks : indexServerOnElement[0])
-      {
-        size_t index=indexRanks.first ;
-        auto& ranks=indexRanks.second ;
-        for(int rank : ranks) vectGlobalIndex[rank].push_back(index) ;
-      }
-      for(auto& vect : vectGlobalIndex ) globalIndex.emplace(vect.first, CArray<size_t,1>(vect.second.data(), shape(vect.second.size()),duplicateData)) ;
-    // some servers receves no index (zeroIndex array) => root process take them into account.
-      if (context->getIntraCommRank()==0) 
-        for(auto& rank : zeroIndex) globalIndex[rank] = CArray<size_t,1>() ; 
-    }
-*/    
+
     if (distType==EDistributionType::BANDS && isUnstructed_) distType=EDistributionType::COLUMNS ;
 
@@ -2134 +2134 @@
   CATCH
 
- 
-
   void CDomain::distributeToServer(CContextClient* client, bool inOut, map<int, CArray<size_t,1>>& globalIndexOut, std::map<int, CArray<size_t,1>>& globalIndexIn,
                                    shared_ptr<CScattererConnector> &scattererConnector, const string& domainId)
@@ -2409 +2407 @@
       CArray<double,1> value ;
       gathererConnector_->transfer(event, value, 0.); 
-      area.resize(ni,nj) ;
-      if (area.numElements()>0) area=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
+      area_2d.resize(ni,nj) ;
+      if (area_2d.numElements()>0) area_2d=CArray<double,2>(value.dataFirst(),shape(ni,nj),neverDeleteData) ; 
     }
   }
@@ -2491 +2489 @@
     m["reorder_domain"] = TRANS_REORDER_DOMAIN;
     m["extract_domain"] = TRANS_EXTRACT_DOMAIN;
+    m["redistribute_domain"] = TRANS_REDISTRIBUTE_DOMAIN;
     return true;
   }

XIOS3/trunk/src/node/domain.hpp

@@ -214 +214 @@
          CArray<double, 2> bounds_lonvalue, bounds_latvalue;
          CArray<double, 1> areavalue;
+         int niValue_ ;
+         int njValue_ ;
+         int ibeginValue_ ;
+         int jbeginValue_ ;
 
 
@@ -241 +245 @@
          void checkArea(void);
          void checkLonLat();
+         void compute2dBox(void) ;
          
        public:

XIOS3/trunk/src/node/field.cpp

@@ -20 +20 @@
 #include "temporal_filter.hpp"
 #include "server_from_client_source_filter.hpp"
+#include "client_online_reader_filter.hpp"
 #include "file_reader_source_filter.hpp"
+#include "grid_redistribute_filter.hpp"
 #include "tracer.hpp"
 #include "graph_package.hpp"
@@ -205 +207 @@
   TRY
   {
-    return clientFromServerSourceFilter_->sendReadDataRequest(tsDataRequested) ;
+    if (clientFromServerSourceFilter_) return clientFromServerSourceFilter_->sendReadDataRequest(tsDataRequested) ;
+    else if (clientOnlineReaderFilter_) return clientOnlineReaderFilter_->sendReadDataRequest(tsDataRequested) ;
+    else ERROR("bool CField::sendReadDataRequest(const CDate& tsDataRequested)", << "uninitialized source filter");
   }
   CATCH_DUMP_ATTR
@@ -217 +221 @@
   TRY
   {
-    return clientFromServerSourceFilter_->sendReadDataRequestIfNeeded() ;
+    if (clientFromServerSourceFilter_) return clientFromServerSourceFilter_->sendReadDataRequestIfNeeded() ;
+    else if (clientOnlineReaderFilter_) return clientOnlineReaderFilter_->sendReadDataRequestIfNeeded() ;
+    else ERROR("bool CField::sendReadDataRequestIfNeeded(void)", << "uninitialized source filter");
   }
   CATCH_DUMP_ATTR
@@ -304 +310 @@
   TRY
   {
-    clientFromServerSourceFilter_->checkForLateData() ;
+    if (clientFromServerSourceFilter_) return clientFromServerSourceFilter_->checkForLateData() ;
+    else if (clientOnlineReaderFilter_) return clientOnlineReaderFilter_->checkForLateData() ;
+    else ERROR("void CField::checkForLateDataFromServer(void)", << "uninitialized source filter");
   }
   CATCH_DUMP_ATTR 
@@ -315 +323 @@
     {
       checkForLateDataFromServer() ;
-      clientFromServerSourceFilter_->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate()) ;
+      if (clientFromServerSourceFilter_) clientFromServerSourceFilter_->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate()) ;
+      else if (clientOnlineReaderFilter_) clientOnlineReaderFilter_->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate()) ;
     } 
     else if (hasCouplerIn())
@@ -325 +334 @@
   CATCH_DUMP_ATTR
 
-
-  void CField::checkIfMustAutoTrigger(void)
-  TRY
-  {
-    mustAutoTrigger = clientFromServerSourceFilter_ ? clientFromServerSourceFilter_->mustAutoTrigger() : false;
-  }
-  CATCH_DUMP_ATTR
-
-  void CField::autoTriggerIfNeeded(void)
-  TRY
-  {
-    if (mustAutoTrigger)
-      clientFromServerSourceFilter_->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate());
-  }
-  CATCH_DUMP_ATTR
-
+  
 
   //----------------------------------------------------------------
@@ -506 +500 @@
                                               bool bufferForWriting)
   {
-    auto& contextBufferSize = bufferSize[client] ;
-    auto& contextMaxEventSize = maxEventSize[client] ;
-    const std::map<int, size_t> mapSize = grid_->getDataBufferSize(client, getId(), bufferForWriting);
+    auto& contextBufferSize = bufferSize[client_] ;
+    auto& contextMaxEventSize = maxEventSize[client_] ;
+    const std::map<int, size_t> mapSize = grid_->getDataBufferSize(client_, getId(), bufferForWriting);
     for(auto& it : mapSize )
     {
@@ -525 +519 @@
                                                    bool bufferForWriting)
   {
-    auto& contextBufferSize = bufferSize[client] ;
-    auto& contextMaxEventSize = maxEventSize[client] ;
-    const std::map<int, size_t> mapSize = grid_->getAttributesBufferSize(client, bufferForWriting);
+    auto& contextBufferSize = bufferSize[client_] ;
+    auto& contextMaxEventSize = maxEventSize[client_] ;
+    const std::map<int, size_t> mapSize = grid_->getAttributesBufferSize(client_, bufferForWriting);
     for(auto& it : mapSize )
     {
@@ -797 +791 @@
   {
     // insert temporal filter before sending to files
-    clientToServerStoreFilter_ = std::shared_ptr<CClientToServerStoreFilter>(new CClientToServerStoreFilter(gc, this, client));
+    clientToServerStoreFilter_ = std::shared_ptr<CClientToServerStoreFilter>(new CClientToServerStoreFilter(gc, this, client_));
     // insert temporal filter before sending to files
     getTemporalDataFilter(gc, fileOut_->output_freq)->connectOutput(clientToServerStoreFilter_, 0);
@@ -809 +803 @@
   } 
 
+/*
+  void CField::connectToOnlineWriter(CGarbageCollector& gc)
+  {
+    // insert temporal filter before sending to files
+    CField* fieldOut ;
+    redistributeFilter_ = std::shared_ptr<CGridRedistributeFilter>(new CGridRedistributeFilter(gc, this, fieldOut));
+    fieldOut->setFileOut(this->getFileOut());
+    fileOut_->replaceEnabledFields(this, fieldOut) ;
+    // insert temporal filter before sending to files
+    getTemporalDataFilter(gc, fileOut_->output_freq)->connectOutput(redistributeFilter_, 0);
+    fieldOut->inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc)); 
+    fieldOut->instantDataFilter = fieldOut->inputFilter ;
+    redistributeFilter_->connectOutput(fieldOut->inputFilter, 0);
+    fieldOut->connectToFileWriter(gc) ;
+    fieldOut->solveServerOperation() ; // might not be called, create a new time functor.... find a better solution later
+    const bool buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
+  
+    if(buildGraph_) 
+    {
+      clientToServerStoreFilter_->graphPackage = new CGraphPackage;
+      clientToServerStoreFilter_->graphEnabled = true;
+      clientToServerStoreFilter_->graphPackage->inFields.push_back(this);
+    }
+  } 
+*/
+  void CField::connectToOnlineWriter(CGarbageCollector& gc)
+  {
+    // insert temporal filter before sending to files
+    clientOnlineWriterFilter_ = std::shared_ptr<CClientOnlineWriterFilter>(new CClientOnlineWriterFilter(gc,this)) ;
+    getTemporalDataFilter(gc, fileOut_->output_freq)->connectOutput(clientOnlineReaderFilter_, 0);
+   
+    const bool buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
+  
+    if(buildGraph_) 
+    {
+      // to do
+    }
+  } 
+
+  void CField::connectToOnlineReader(CGarbageCollector& gc)
+  {
+    // insert temporal filter before sending to files
+    clientOnlineReaderFilter_ = std::shared_ptr<CClientOnlineReaderFilter>(new CClientOnlineReaderFilter(gc,this)) ;
+    clientOnlineReaderFilter_ -> connectOutput(inputFilter,0) ;
+  } 
+
   void CField::connectToCouplerOut(CGarbageCollector& gc)
   {
     // insert temporal filter before sending to files
-    clientToServerStoreFilter_ = std::shared_ptr<CClientToServerStoreFilter>(new CClientToServerStoreFilter(gc, this, client));
+    clientToServerStoreFilter_ = std::shared_ptr<CClientToServerStoreFilter>(new CClientToServerStoreFilter(gc, this, client_));
     instantDataFilter->connectOutput(clientToServerStoreFilter_, 0);
     const bool buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
@@ -951 +991 @@
   void CField::connectToServerToClient(CGarbageCollector& gc)
   {
-    serverToClientStoreFilter_ = std::shared_ptr<CServerToClientStoreFilter>(new CServerToClientStoreFilter(gc, this, client));
+    serverToClientStoreFilter_ = std::shared_ptr<CServerToClientStoreFilter>(new CServerToClientStoreFilter(gc, this, client_));
     instantDataFilter->connectOutput(serverToClientStoreFilter_, 0);
     const bool buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
@@ -1435 +1475 @@
   {
     CContext* context = CContext::getCurrent();
-    client = contextClient;
+    client_ = contextClient;
   
     // A grid is sent by a client (both for read or write) or by primary server (write only)
@@ -1441 +1481 @@
     {
       if (getRelFile()->mode.isEmpty() || (!getRelFile()->mode.isEmpty() && getRelFile()->mode == CFile::mode_attr::write))
-        grid_->setContextClient(contextClient);
+        /*grid_->setContextClient(contextClient) */; // => nothing to do with thats now, to remove...
     }
     else if (context->getServiceType()==CServicesManager::CLIENT)
     {
       if (grid_)
-        grid_->setContextClient(contextClient);
+        /*grid_->setContextClient(contextClient)*/; // => nothing to do with thats now, to remove...
       else
+
         ERROR( "CField::setContextClient(contextClient)",
                << "Grid not defined for " << getId()
@@ -1459 +1500 @@
   void CField::sendFieldToFileServer(void)
   {
-    CContext::getCurrent()->sendContextToFileServer(client);
-    getRelFile()->sendFileToFileServer(client);
+    CContext::getCurrent()->sendContextToFileServer(client_);
+    getRelFile()->sendFileToFileServer(client_);
     sentGrid_ = grid_-> duplicateSentGrid() ;
-    sentGrid_->sendGridToFileServer(client, false);
+    sentGrid_->sendGridToFileServer(client_, false);
     name = getFieldOutputName() ;
-    this->sendAllAttributesToServer(client);
-    this->sendAddAllVariables(client);
+    this->sendAllAttributesToServer(client_);
+    this->sendAddAllVariables(client_);
   }
 
   void CField::sendFieldToInputFileServer(void)
   {
-    CContext::getCurrent()->sendContextToFileServer(client);
-    getRelFile()->sendFileToFileServer(client);
+    CContext::getCurrent()->sendContextToFileServer(client_);
+    getRelFile()->sendFileToFileServer(client_);
     sentGrid_ = grid_-> duplicateSentGrid() ;
-    sentGrid_->sendGridToFileServer(client, true);
+    sentGrid_->sendGridToFileServer(client_, true);
     read_access=true ; // not the best solution, but on server side, the field must be a starting point of the workflow
                        // must be replace by a better solution when implementing filters for reading and send to client
                        // on server side
-    this->sendAllAttributesToServer(client);
-    this->sendAddAllVariables(client);
+    this->sendAllAttributesToServer(client_);
+    this->sendAddAllVariables(client_);
   }
 
@@ -1486 +1527 @@
     else sendFieldToCouplerOut_done_=true ;
     sentGrid_ = grid_-> duplicateSentGrid() ;
-    sentGrid_->sendGridToCouplerOut(client, this->getId());
+    sentGrid_->sendGridToCouplerOut(client_, this->getId());
     this->sendGridCompleted();
 
@@ -1502 +1543 @@
       CEventClient event(getType(),EVENT_ID_GRID_COMPLETED);
 
-      if (client->isServerLeader())
+      if (client_->isServerLeader())
       {
         CMessage msg;
         msg<<this->getId();
-        for (auto& rank : client->getRanksServerLeader()) event.push(rank,1,msg);
-        client->sendEvent(event);
-      }
-      else client->sendEvent(event);
+        for (auto& rank : client_->getRanksServerLeader()) event.push(rank,1,msg);
+        client_->sendEvent(event);
+      }
+      else client_->sendEvent(event);
    }
    CATCH_DUMP_ATTR

XIOS3/trunk/src/node/field.hpp

@@ -28 +28 @@
 #include "client_to_server_store_filter.hpp"
 #include "file_reader_source_filter.hpp"
+#include "client_online_reader_filter.hpp"
+#include "client_online_writer_filter.hpp"
 
 
@@ -56 +58 @@
    class CSourceFilter;
    class CServerToClientFilter;
+   class CGridRedistributeFilter;
    ///--------------------------------------------------------------
 
@@ -199 +202 @@
         void checkForLateDataFromCoupler(void) ;
 
-        void checkIfMustAutoTrigger(void); // ym obsolete
-        void autoTriggerIfNeeded(void); //ym obsolete
         void triggerLateField(void) ;
 
@@ -237 +238 @@
         void connectToFileReader(CGarbageCollector& gc) ;
         void connectToServerToClient(CGarbageCollector& gc) ;
+        void connectToOnlineWriter(CGarbageCollector& gc) ;
+        void connectToOnlineReader(CGarbageCollector& gc) ;
 
         void setContextClientDataBufferSize(map<CContextClient*,map<int,size_t>>& bufferSize, 
@@ -267 +270 @@
          CGrid*  grid_=nullptr;
          CGrid* getGrid(void) { return grid_; } 
+         void setGrid(CGrid* grid) { grid_=grid; } 
       
       private:
@@ -327 +331 @@
         
       private:
-         CContextClient* client;
+         CContextClient* client_;
       public:
          void setContextClient(CContextClient* newContextClient);
-         CContextClient* getContextClient(void) {return client;}
+         CContextClient* getContextClient(void) {return client_;}
 
       private:
@@ -372 +376 @@
          std::shared_ptr<COutputPin> selfReferenceFilter; // probably redondant with inputFilter
 
-         //! The source filter for data provided by the client
-//         std::shared_ptr<CSourceFilter> clientSourceFilter; // obsolete to remove
  
          //! The source filter for data provided by the model to enter the client workflow
@@ -393 +395 @@
          std::shared_ptr<CFileReaderSourceFilter> fileReaderSourceFilter_;
 
-         //! The source filter for data provided by the server
-//         std::shared_ptr<CSourceFilter> serverSourceFilter; // obsolete to remove
-        
          //! The terminal filter which send data to server for writing
          std::shared_ptr<CClientToServerStoreFilter> clientToServerStoreFilter_;
@@ -405 +404 @@
          std::shared_ptr<CServerToClientStoreFilter> serverToClientStoreFilter_;
 
+         //! the filter to redistribute data before to call the fileWriterStoreFilter ==> to remove
+         std::shared_ptr<CGridRedistributeFilter>  redistributeFilter_ ;
+
+          //! the filter to connect to online reader
+         std::shared_ptr<CClientOnlineReaderFilter>  clientOnlineReaderFilter_ ;
+
+          //! the filter to connect to online writer
+         std::shared_ptr<CClientOnlineWriterFilter>  clientOnlineWriterFilter_ ;
+
 
    }; // class CField

XIOS3/trunk/src/node/file.cpp

@@ -178 +178 @@
 
       return (this->enabledFields);
+   }
+   CATCH_DUMP_ATTR
+
+   void CFile::replaceEnabledFields(CField* fieldIn, CField* fieldOut)
+   TRY
+   {
+     for(auto& enableField : enabledFields) if (enableField==fieldIn) enableField=fieldOut ;
    }
    CATCH_DUMP_ATTR
@@ -979 +986 @@
 
    /*!
-    * Post-process the filter graph for each active field.
-    */
-   void CFile::postProcessFilterGraph()
-   TRY
-   {
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFields[i]->checkIfMustAutoTrigger();
-     }
-   }
-   CATCH_DUMP_ATTR
-
-   /*!
      Prefetching the data for enabled fields read from file.
    */
@@ -1004 +997 @@
      for (int i = 0; i < size; ++i)
        this->enabledFields[i]->sendReadDataRequest(CContext::getCurrent()->getCalendar()->getCurrentDate());
-   }
-   CATCH_DUMP_ATTR
-
-   /*!
-     Do all pre timestep operations for enabled fields in read mode:
-      - Check that the data excepted from server has been received
-      - Check if some filters must auto-trigger
-   */
-   void CFile::doPreTimestepOperationsForEnabledReadModeFields(void)
-   TRY
-   {
-     if (mode.isEmpty() || mode.getValue() != mode_attr::read)
-       return;
-
-     int size = this->enabledFields.size();
-     for (int i = 0; i < size; ++i)
-     {
-       this->enabledFields[i]->checkForLateDataFromServer();
-       this->enabledFields[i]->autoTriggerIfNeeded();
-     }
    }
    CATCH_DUMP_ATTR

XIOS3/trunk/src/node/file.hpp

@@ -83 +83 @@
                                                 int default_level = 1,
                                                 bool default_enabled = true);
+         void replaceEnabledFields(CField* fieldIn, CField* fieldOut) ;
 
          StdString dumpClassAttributes(void);
@@ -112 +113 @@
          void processEnabledFile(void);
          
-         void postProcessFilterGraph();
          void prefetchEnabledReadModeFields();
-         void doPreTimestepOperationsForEnabledReadModeFields();
          void doPostTimestepOperationsForEnabledReadModeFields();
 
@@ -212 +211 @@
        
        private:
-
-
+         bool isOnline_=false;
+       public:
+         bool isOnline(void) { return isOnline_ ;}
+         void setOnline(bool online=true) { isOnline_=online ;} 
       public:
         //         virtual void toBinary  (StdOStream& os) const;

XIOS3/trunk/src/node/grid.cpp

@@ -29 +29 @@
 #include "generic_algorithm_transformation.hpp"
 #include "algo_types.hpp"
+#include "redistribute_domain.hpp"
+#include "redistribute_axis.hpp"
+#include "redistribute_scalar.hpp"
+
 
 #include <regex>
@@ -48 +52 @@
       , axisPositionInGrid_(), hasDomainAxisBaseRef_(false)
       , gridSrc_(), order_()
-      , clients()
    {
      setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
@@ -66 +69 @@
       , axisPositionInGrid_(), hasDomainAxisBaseRef_(false)
       , gridSrc_(), order_()
-      , clients()
    {
      setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
@@ -1468 +1470 @@
     distributeGridToServer(client, false, fieldId) ;
   }
+
+  CGrid* CGrid::redistributeGridToWriter(void)
+  {
+    CContext* context = CContext::getCurrent();
+    CGrid* redistributedGrid ;
+    string redistributeGridId="redistributedToWriter__"+getId() ;
+    if (has(redistributeGridId)) redistributedGrid = get(redistributeGridId) ;
+    else
+    {
+      redistributedGrid = CGrid::create(redistributeGridId) ;
+      // simple Distribution for now 
+      // distribute over the fisrt element except if it is a scalar
+      auto& elements = getElements() ;
+      int posDistributed = 0 ;
+      for(auto& element : elements)
+      {
+        if (element.type==TYPE_DOMAIN) break ;
+        else if (element.type==TYPE_AXIS) break ;
+        else if (element.type==TYPE_SCALAR) posDistributed++ ;
+      }
+      if (posDistributed==elements.size()) posDistributed=0 ; // grid composed only of scalar
+    
+      for(int i=0 ; i<elements.size() ; i++)
+      {
+        if (elements[i].type==TYPE_DOMAIN) 
+        {
+          CDomain* domain = redistributedGrid->addDomain() ;
+          domain->domain_ref=elements[i].domain->getId() ;
+          domain->name = elements[i].domain->getDomainOutputName() ;
+          CRedistributeDomain* redistributeDomain = dynamic_cast<CRedistributeDomain *>(domain->addTransformation(TRANS_REDISTRIBUTE_DOMAIN, "")) ;
+          redistributeDomain->type.setValue(posDistributed==i ? CRedistributeDomain::type_attr::bands : CRedistributeDomain::type_attr::full);
+        }
+        else if (elements[i].type==TYPE_AXIS)      
+        {
+          CAxis* axis = redistributedGrid->addAxis() ;
+          axis->axis_ref=elements[i].axis->getId() ;
+          axis->name = elements[i].axis->getAxisOutputName() ;
+          CRedistributeAxis* redistributeAxis = dynamic_cast<CRedistributeAxis *>(axis->addTransformation(TRANS_REDISTRIBUTE_AXIS, "")) ;
+          redistributeAxis->type.setValue(posDistributed==i ? CRedistributeAxis::type_attr::bands : CRedistributeAxis::type_attr::full);
+        }
+        else if (elements[i].type==TYPE_SCALAR)      
+        {
+          CScalar* scalar = redistributedGrid->addScalar() ;
+          scalar->scalar_ref=elements[i].scalar->getId() ;
+          scalar->name = elements[i].scalar->getScalarOutputName() ;
+          CRedistributeScalar* redistributeScalar = dynamic_cast<CRedistributeScalar *>(scalar->addTransformation(TRANS_REDISTRIBUTE_SCALAR, "")) ;
+          redistributeScalar->type.setValue(posDistributed==i ? CRedistributeScalar::type_attr::root : CRedistributeScalar::type_attr::full);
+        }
+      }
+    }
+
+    return redistributedGrid ; 
+  }
+
+
 
 
@@ -2369 +2426 @@
   TRY
   {
-    if (clientsSet.find(contextClient)==clientsSet.end())
-    {
-      clients.push_back(contextClient) ;
-      clientsSet.insert(contextClient);
-    }
     for (auto domain : getDomains()) domain->setContextClient(contextClient);
     for (auto axis : getAxis()) axis->setContextClient(contextClient);
     for (auto scalar : getScalars()) scalar->setContextClient(contextClient);
-   
   }
   CATCH_DUMP_ATTR
@@ -2473 +2524 @@
   }
 
+  void CGrid::computeRedistributeToWriterConnector(CGrid* gridSrc)
+  {
+    CContext* context = CContext::getCurrent();
+
+    vector<shared_ptr<CLocalView>> srcViews ;
+    vector<shared_ptr<CLocalView>> dstViews ;
+        
+    for(auto& element : gridSrc->getElements())
+    {
+      if (element.type==TYPE_DOMAIN) srcViews.push_back(element.domain->getLocalView(CElementView::WORKFLOW)) ;
+      else if (element.type==TYPE_AXIS) srcViews.push_back(element.axis->getLocalView(CElementView::WORKFLOW)) ; 
+      else if (element.type==TYPE_SCALAR) srcViews.push_back(element.scalar->getLocalView(CElementView::WORKFLOW)) ; 
+    }
+
+    for(auto& element : this->getElements())
+    {
+      if (element.type==TYPE_DOMAIN) dstViews.push_back(element.domain->getLocalView(CElementView::WORKFLOW)) ;
+      else if (element.type==TYPE_AXIS) dstViews.push_back(element.axis->getLocalView(CElementView::WORKFLOW)) ; 
+      else if (element.type==TYPE_SCALAR) dstViews.push_back(element.scalar->getLocalView(CElementView::WORKFLOW)) ; 
+    }
+
+    redistributeToWriterConnector_ = make_shared<CGridTransformConnector>(srcViews, dstViews, context->getIntraComm()) ;
+    redistributeToWriterConnector_ -> computeConnector(true) ;
+  }
   
 } // namespace xios

XIOS3/trunk/src/node/grid.hpp

@@ -279 +279 @@
 
         bool isDataDistributed(void) ; 
-      private:
-
-/** Clients that have to send a grid. There can be multiple clients in case of secondary server, otherwise only one client. */
-        std::list<CContextClient*> clients;
-        std::set<CContextClient*> clientsSet;
 
       private:
@@ -327 +322 @@
      //////////////////////////////////////////////////////////////////////////////////////
       public:
+        CGrid* redistributeGridToWriter(void) ;
+      public:
        CGrid* duplicateSentGrid(void) ;
       private:
@@ -402 +399 @@
          void computeServerFromClientConnector(void) ;
 
+      private:
+         shared_ptr<CGridTransformConnector> redistributeToWriterConnector_ = nullptr ;
+      public:
+         shared_ptr<CGridTransformConnector> getRedistributeToWriterConnector(CGrid* gridSrc) { if (redistributeToWriterConnector_==nullptr) computeRedistributeToWriterConnector(gridSrc) ; return redistributeToWriterConnector_;}
+         void computeRedistributeToWriterConnector(CGrid* gridSrc) ;
+
+
    }; // class CGrid
 

XIOS3/trunk/src/node/node_enum.hpp

@@ -45 +45 @@
          ePoolNode,gPoolNode,
          eServiceNode,gServiceNode,
-//         eService, gService
+         eRedistributeDomain, gRedistributeDomain,
+         eRedistributeAxis, gRedistributeAxis,
+         eRedistributeScalar, gRedistributeScalar,
        } ENodeType;
 

XIOS3/trunk/src/node/node_type.hpp

@@ -35 +35 @@
 #include "pool_node.hpp"
 #include "service_node.hpp"
+#include "redistribute_domain.hpp"
+#include "redistribute_axis.hpp"
+#include "redistribute_scalar.hpp"
 
 

XIOS3/trunk/src/node/scalar.cpp

@@ -47 +47 @@
     m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_SCALAR;
     m["reduce_scalar"] = TRANS_REDUCE_SCALAR_TO_SCALAR;
+    m["redistribute_scalar"] = TRANS_REDISTRIBUTE_SCALAR;
     return true;
   }
@@ -122 +123 @@
     if (n.isEmpty()) n=1 ;
     if (mask.isEmpty()) mask=true ;
+    
+    hasValue_ =  (value.isEmpty())  ? false :true ;
+    hasBounds_ = (bounds.isEmpty()) ? false :true ;
+    hasLabel_ =  (label.isEmpty())  ? false :true ;
+
 
     initializeLocalElement() ;

XIOS3/trunk/src/node/scalar.hpp

@@ -143 +143 @@
 
       bool isEqual(CScalar* scalar);
+
+    public:
+      bool hasValue() { return hasValue_; }
+      bool hasBounds() { return hasBounds_; }
+      bool hasLabel() { return hasLabel_; }
+    private:
+      bool hasValue_  = false ;
+      bool hasBounds_ = false ;
+      bool hasLabel_  = false ;
     private:  
           /** Clients that have to send a scalar. There can be multiple clients in case of secondary server, otherwise only one client. */

XIOS3/trunk/src/object_factory_decl2.cpp

@@ -23 +23 @@
   macro(CPoolNode)
   macro(CServiceNode)
+  macro(CRedistributeDomain)
+  macro(CRedistributeAxis)
+  macro(CRedistributeScalar)
 }
 

XIOS3/trunk/src/object_factory_decl4.cpp

@@ -19 +19 @@
   macro(CReorderDomainGroup)
   macro(CExtractDomainGroup)
+  macro(CRedistributeDomainGroup)
+  macro(CRedistributeAxisGroup)
+  macro(CRedistributeScalarGroup)
 }
 

XIOS3/trunk/src/object_template_decl.cpp

@@ -38 +38 @@
   template class CObjectTemplate<CPoolNode>;
   template class CObjectTemplate<CServiceNode>;
+  template class CObjectTemplate<CRedistributeDomain>;
+  template class CObjectTemplate<CRedistributeAxis>;
+  template class CObjectTemplate<CRedistributeScalar>;
+
   
   template class CObjectTemplate<CContextGroup>;
@@ -71 +75 @@
   template class CObjectTemplate<CPoolNodeGroup>;
   template class CObjectTemplate<CServiceNodeGroup>;
+  template class CObjectTemplate<CRedistributeDomainGroup>;
+  template class CObjectTemplate<CRedistributeAxisGroup>;
+  template class CObjectTemplate<CRedistributeScalarGroup>;
 
 }

XIOS3/trunk/src/transformation/algo_types.cpp

@@ -10 +10 @@
       if (!first) return ;
       bool ret ;
-      std::cout<<"register Transformation"<<std::endl ;
       ret=CScalarAlgorithmReduceAxis::registerTrans();
       ret=CScalarAlgorithmExtractAxis::registerTrans();
       ret=CScalarAlgorithmReduceDomain::registerTrans();
       ret=CScalarAlgorithmReduceScalar::registerTrans();
-
+      ret=CScalarAlgorithmRedistribute::registerTrans() ;
       //! Axis
       ret=CAxisAlgorithmZoom::registerTrans();
@@ -27 +26 @@
       ret=CAxisAlgorithmTemporalSplitting::registerTrans();
       ret=CAxisAlgorithmDuplicateScalar::registerTrans();
+      ret=CAxisAlgorithmRedistribute::registerTrans() ;
 
       //! Domain
@@ -36 +36 @@
       ret=CDomainAlgorithmExtract::registerTrans();
       ret=CDomainAlgorithmGenerateRectilinear::registerTrans() ;
+      ret=CDomainAlgorithmRedistribute::registerTrans() ;
       first=false ;
     }

XIOS3/trunk/src/transformation/algo_types.hpp

@@ -14 +14 @@
 #include "scalar_algorithm_reduce_domain.hpp"
 #include "scalar_algorithm_reduce_scalar.hpp"
+#include "scalar_algorithm_redistribute.hpp"
 
 #include "axis_algorithm_inverse.hpp"
@@ -25 +26 @@
 #include "axis_algorithm_temporal_splitting.hpp"
 #include "axis_algorithm_duplicate_scalar.hpp"
-
+#include "axis_algorithm_redistribute.hpp"
 
 #include "domain_algorithm_zoom.hpp"
@@ -34 +35 @@
 #include "domain_algorithm_reorder.hpp"
 #include "domain_algorithm_extract.hpp"
+#include "domain_algorithm_redistribute.hpp"
 
 namespace xios

XIOS3/trunk/src/transformation/axis_algorithm/axis_algorithm_extract.cpp

@@ -92 +92 @@
   }
 
-  if (axisSrc_->hasValue) axisDest_->value.resize(nDest);
-  if (axisSrc_->hasLabel) axisDest_->label.resize(nDest);
-  if (axisSrc_->hasBounds) axisDest_->bounds.resize(2,nDest);
+  if (axisSrc_->hasValue()) axisDest_->value.resize(nDest);
+  if (axisSrc_->hasLabel()) axisDest_->label.resize(nDest);
+  if (axisSrc_->hasBounds()) axisDest_->bounds.resize(2,nDest);
 
   auto& transMap = this->transformationMapping_;
@@ -142 +142 @@
       // -----------------------------------------------------------------------------
 
-      if (axisSrc_->hasValue)
+      if (axisSrc_->hasValue())
       {
         axisDest_->value(countDest) = axisSrc_->value(countSrc);
       }
-      if (axisSrc_->hasLabel)
+      if (axisSrc_->hasLabel())
       {
         axisDest_->label(countDest) = axisSrc_->label(countSrc);
       }
-      if (axisSrc_->hasBounds)
+      if (axisSrc_->hasBounds())
       {
         axisDest_->bounds(0,countDest) = axisSrc_->bounds(0,countSrc);

XIOS3/trunk/src/transformation/axis_algorithm/axis_algorithm_inverse.cpp

@@ -123 +123 @@
   }
 
-  if (axisSrc_->hasValue)
+  if (axisSrc_->hasValue())
   {
     axisDestination->value.resize(indexSize);
@@ -132 +132 @@
   }
 
-  if (axisSrc_->hasBounds)
+  if (axisSrc_->hasBounds())
   {
     axisDestination->bounds.resize(2,indexSize);

XIOS3/trunk/src/transformation/axis_algorithm/axis_algorithm_zoom.cpp

@@ -79 +79 @@
 
   axisDest_->mask.resize(nDest);
-  if (axisSrc_->hasValue) axisDest_->value.resize(nDest);
-  if (axisSrc_->hasLabel) axisDest_->label.resize(nDest);
-  if (axisSrc_->hasBounds) axisDest_->bounds.resize(2,nDest);
+  if (axisSrc_->hasValue()) axisDest_->value.resize(nDest);
+  if (axisSrc_->hasLabel()) axisDest_->label.resize(nDest);
+  if (axisSrc_->hasBounds()) axisDest_->bounds.resize(2,nDest);
 
   auto& transMap = this->transformationMapping_;
@@ -92 +92 @@
     axisDest_->mask(iDest) = axisSrc_->mask(iSrc);
 
-    if (axisSrc_->hasValue)
+    if (axisSrc_->hasValue())
       axisDest_->value(iDest) = axisSrc_->value(iSrc);
-    if (axisSrc_->hasLabel)
+    if (axisSrc_->hasLabel())
       axisDest_->label(iDest) = axisSrc_->label(iSrc);
-    if (axisSrc_->hasBounds)
+    if (axisSrc_->hasBounds())
     {
       axisDest_->bounds(0,iDest) = axisSrc_->bounds(0,iSrc);

XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_extract.cpp

@@ -76 +76 @@
    domainDestination->bounds_lon_2d.reset();
    domainDestination->bounds_lat_2d.reset();
-   domainDestination->area.reset();
+   domainDestination->area_1d.reset();
+   domainDestination->area_2d.reset();
    domainDestination->radius.reset();
    
@@ -175 +176 @@
     }
   }
-  if (domainSrc_->hasArea) domainDest_->area.resize(niDest,njDest);
-
+  if (domainSrc_->hasArea) 
+  {
+    if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d.resize(niDest,njDest);
+    else if (!domainSrc_->area_1d.isEmpty()) domainDest_->area_1d.resize(niDest*njDest);
+  }
   // Set attributes required to define domainDestination->localElement_ and associated views, full and workflow)
   CArray<size_t,1> sourceGlobalIdx = domainSource->getLocalElement()->getGlobalIndex();
@@ -241 +245 @@
 
       // area
-      if (!domainSrc_->area.isEmpty())
-      {
-        domainDest_->area(iIdxDestLocal,jIdxDestLocal) = domainSrc_->area(iIdxSrcLocal,jIdxSrcLocal);
-      }
+      if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d(iIdxDestLocal,jIdxDestLocal) = domainSrc_->area_2d(iIdxSrcLocal,jIdxSrcLocal);
+      else if (!domainSrc_->area_1d.isEmpty())  domainDest_->area_1d(countDest) = domainSrc_->area_1d(countSrc);
 
       // bounds

XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_reorder.cpp

@@ -128 +128 @@
    else if (!domainSource->lonvalue_2d.isEmpty() )
    {
-     domainDestination->latvalue_2d.resize( domainSource->latvalue_2d.numElements() );
-     domainDestination->lonvalue_2d.resize( domainSource->lonvalue_2d.numElements() );
+     domainDestination->latvalue_2d.resize( domainSource->latvalue_2d.shape() );
+     domainDestination->lonvalue_2d.resize( domainSource->lonvalue_2d.shape() );
      domainDestination->latvalue_2d = domainSource->latvalue_2d;
      domainDestination->lonvalue_2d = domainSource->lonvalue_2d;
@@ -145 +145 @@
    else if (!domainSource->bounds_lon_2d.isEmpty() )
    {
-     domainDestination->bounds_lon_2d.resize( domainSource->bounds_lon_2d.numElements() );
-     domainDestination->bounds_lat_2d.resize( domainSource->bounds_lat_2d.numElements() );
+     domainDestination->bounds_lon_2d.resize( domainSource->bounds_lon_2d.shape() );
+     domainDestination->bounds_lat_2d.resize( domainSource->bounds_lat_2d.shape() );
      domainDestination->bounds_lon_2d = domainSource->bounds_lon_2d;
      domainDestination->bounds_lat_2d = domainSource->bounds_lat_2d;
    }
    // set area
-   if (!domainSource->area.isEmpty() )
-   {
-     domainDestination->area.resize( domainSource->area.numElements() );
-     domainDestination->area = domainSource->area;    
-   }
+   if (!domainSource->area_1d.isEmpty() )
+   {
+     domainDestination->area_1d.resize( domainSource->area_1d.numElements() );
+     domainDestination->area_1d = domainSource->area_1d;    
+   }
+   else if (!domainSource->area_2d.isEmpty() )
+   {
+     domainDestination->area_2d.resize( domainSource->area_2d.shape() );
+     domainDestination->area_2d = domainSource->area_2d;    
+   }
+
    if (!domainSource->radius.isEmpty() )
      domainDestination->radius = domainSource->radius;

XIOS3/trunk/src/transformation/domain_algorithm/domain_algorithm_zoom.cpp

@@ -173 +173 @@
     }
   }
-  if (domainSrc_->hasArea) domainDest_->area.resize(niDest,njDest);
-
+  if (domainSrc_->hasArea)
+  {
+    if (!domainSrc_->area_1d.isEmpty()) domainDest_->area_1d.resize(niDest*njDest);
+    else if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d.resize(niDest,njDest);
+  }
 
   for (int iDest = 0; iDest < niDest; iDest++)
@@ -196 +199 @@
 
       if (domainSrc_->hasArea)
-        domainDest_->area(iDest,jDest) = domainSrc_->area(iSrc,jSrc);
+      {  
+         if (!domainSrc_->area_1d.isEmpty())      domainDest_->area_1d(indLocDest)  = domainSrc_->area_1d(ind);
+         else if (!domainSrc_->area_2d.isEmpty()) domainDest_->area_2d(iDest,jDest) = domainSrc_->area_2d(iSrc,jSrc);
+      }
 
       if (domainSrc_->hasLonLat)

XIOS3/trunk/src/transformation/scalar_algorithm/scalar_algorithm_extract_axis.cpp

@@ -108 +108 @@
     }
 
-    if (axisSource->hasValue)
+    if (axisSource->hasValue())
     {
       scalarDestination->value = axisSource->value(idxSrc);

XIOS3/trunk/src/transformation/transformation_enum.hpp

@@ -26 +26 @@
         TRANS_REORDER_DOMAIN = 17,
         TRANS_EXTRACT_DOMAIN = 18,
-        TRANS_EXTRACT_AXIS = 19
+        TRANS_EXTRACT_AXIS = 19,
+        TRANS_REDISTRIBUTE_DOMAIN = 20,
+        TRANS_REDISTRIBUTE_AXIS = 21,
+        TRANS_REDISTRIBUTE_SCALAR = 22
       } ETranformationType;
 

XIOS3/trunk/src/transport/context_client.cpp

@@ -18 +18 @@
 #include "one_sided_context_client.hpp"
 #include "legacy_context_client.hpp"
+#include "online_context_client.hpp"
+
 
 namespace xios
@@ -61 +63 @@
       if (defaultProtocol=="one_sided") return getNew<CContextClient::oneSided>(parent, intraComm, interComm) ;
       else if  (defaultProtocol=="legacy") return getNew<CContextClient::legacy>(parent, intraComm, interComm) ;
+      else if  (defaultProtocol=="online") return getNew<CContextClient::online>(parent, intraComm, interComm) ;
       else if  (defaultProtocol=="default") return getNew<CContextClient::legacy>(parent, intraComm, interComm) ;
       else ERROR("CContextClient* CContextClient::getNew<CContextClient::generic>(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer)",
@@ -76 +79 @@
     { 
       return new CLegacyContextClient(parent, intraComm, interComm, parentServer); 
+    }
+
+    template<>
+    CContextClient* CContextClient::getNew<CContextClient::online>(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer)
+    { 
+      return new COnlineContextClient(parent, intraComm, interComm, parentServer); 
     }
 

XIOS3/trunk/src/transport/context_client.hpp

@@ -28 +28 @@
   {
     public:
-      enum ETransport { generic, legacy, oneSided}  ;
+      enum ETransport { generic, legacy, oneSided, online}  ;
       
       template<ETransport transport=generic> 
@@ -56 +56 @@
 
 
+      virtual ETransport getType(void) = 0 ;
       // Send event to server
       virtual void sendEvent(CEventClient& event)=0;
@@ -68 +69 @@
       virtual void setBufferSize(const std::map<int,StdSize>& mapSize)=0;
 
-
+      public: 
+        static CContextClient* ONLINE(void) { return reinterpret_cast<CContextClient*>(0xdeaddead);}
     protected:
 
@@ -104 +106 @@
   CContextClient* CContextClient::getNew<CContextClient::legacy>(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer) ;
 
+  template<>
+  CContextClient* CContextClient::getNew<CContextClient::online>(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer) ;
+
 
 }

XIOS3/trunk/src/transport/legacy_context_client.cpp

@@ -40 +40 @@
     }
 
+    CContextClient::ETransport getType(void) {return CContextClient::legacy ;}
 
     /*!

XIOS3/trunk/src/transport/legacy_context_client.hpp

@@ -31 +31 @@
 
       // Send event to server
+      ETransport getType(void) {return legacy ;}
       void sendEvent(CEventClient& event);
       void eventLoop(void) ;

XIOS3/trunk/src/transport/legacy_context_server.cpp

@@ -323 +323 @@
         {
           eventScheduler_->registerEvent(currentTimeLine,hashId);
+          info(100)<<"Context id "<<context->getId()<<"Schedule event : "<< currentTimeLine <<"  "<<hashId<<endl ;
           scheduled=true;
         }
@@ -342 +343 @@
             if (!flag) return ;
             eventScheduled_=false ;
+          }
+          
+          if (CXios::checkEventSync)
+          {
+            int typeId, classId, typeId_in, classId_in;
+            long long timeLine_out;
+            long long timeLine_in( currentTimeLine );
+            typeId_in=event->type ;
+            classId_in=event->classId ;
+   //        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm) ; // MPI_UINT64_T standardized by MPI 3
+            MPI_Allreduce(&timeLine_in,&timeLine_out, 1, MPI_LONG_LONG_INT, MPI_SUM, intraComm) ; 
+            MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm) ;
+            MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm) ;
+            if (typeId/intraCommSize!=event->type || classId/intraCommSize!=event->classId || timeLine_out/intraCommSize!=currentTimeLine)
+            {
+               ERROR("void CLegacyContextClient::sendEvent(CEventClient& event)",
+                  << "Event are not coherent between client for timeline = "<<currentTimeLine);
+            }
           }
 

XIOS3/trunk/src/transport/one_sided_context_client.hpp

@@ -30 +30 @@
       COneSidedContextClient(CContext* parent, MPI_Comm intraComm, MPI_Comm interComm, CContext* parentServer = 0);
 
+      ETransport getType(void) {return oneSided ;}
       // Send event to server
       void sendEvent(CEventClient& event);

XIOS3/trunk/src/type/type_util.hpp

@@ -70 +70 @@
     class CServiceNode ;
     class CServiceNodeGroup ;
-      
+    class CRedistributeDomain;
+    class CRedistributeDomainGroup;
+    class CRedistributeAxis;
+    class CRedistributeAxisGroup;
+    class CRedistributeScalar;
+    class CRedistributeScalarGroup;
+       
   template <typename T> inline string getStrType(void);
 
@@ -158 +164 @@
   macro(CServiceNode)
   macro(CServiceNodeGroup)
-  
+  macro(CRedistributeDomain)
+  macro(CRedistributeDomainGroup)  
+  macro(CRedistributeAxis)
+  macro(CRedistributeAxisGroup)  
+  macro(CRedistributeScalar)
+  macro(CRedistributeScalarGroup)  
+
 #undef macro
 }

XIOS3/trunk/src/xml_parser_decl.cpp

@@ -44 +44 @@
     macro( PoolNode )
     macro( ServiceNode )
+    macro( RedistributeDomain )
+    macro( RedistributeAxis )
+    macro( RedistributeScalar )
+
   }
 }