Changeset 551

Timestamp:

02/11/15 16:23:02 (9 years ago)

Author:

mhnguyen

Message:

Redesigning grid structure

+) Add an intermediate class to calculate distribution on client and servers
+) Change all index of attributes to zero (0), instead of one(1)

Test
+) On Curie
+) Test new features passes but some data are still shifted

Location:

XIOS/trunk

Files:

• inputs/Version2/iodef.xml (modified) (1 diff)
• src/attribute_array_decl.cpp (modified) (1 diff)
• src/config/axis_attribute.conf (modified) (1 diff)
• src/config/grid_attribute.conf (modified) (1 diff)
• src/distribution.cpp (added)
• src/distribution.hpp (added)
• src/interface/c_attr/icgrid_attr.cpp (modified) (10 diffs)
• src/interface/c_attr/icgridgroup_attr.cpp (modified) (13 diffs)
• src/node/axis.cpp (modified) (3 diffs)
• src/node/axis.hpp (modified) (1 diff)
• src/node/distribution_client.cpp (added)
• src/node/distribution_client.hpp (added)
• src/node/distribution_server.cpp (added)
• src/node/distribution_server.hpp (added)
• src/node/domain.cpp (modified) (18 diffs)
• src/node/domain.hpp (modified) (1 diff)
• src/node/field.cpp (modified) (3 diffs)
• src/node/grid.cpp (modified) (26 diffs)
• src/node/grid.hpp (modified) (7 diffs)
• src/test/test_new_features.f90 (modified) (2 diffs)

XIOS/trunk/inputs/Version2/iodef.xml

@@ -20 +20 @@
 
    <axis_definition>
-     <axis id="axis_A" zoom_size="2" zoom_end="3" />
+     <axis id="axis_A" />
      <axis id="axis_B" zoom_size="2" zoom_end="3" />
    </axis_definition>

XIOS/trunk/src/attribute_array_decl.cpp

@@ -9 +9 @@
   template class CAttributeArray<int,1> ;
   template class CAttributeArray<int,2> ;
+  template class CAttributeArray<bool,1> ;
   template class CAttributeArray<bool,2> ;
   template class CAttributeArray<bool,3> ;

XIOS/trunk/src/config/axis_attribute.conf

@@ -14 +14 @@
 DECLARE_ATTRIBUTE(StdString, axis_ref)
 
+/* LOCAL */
+DECLARE_ATTRIBUTE(int,       data_n)
+DECLARE_ATTRIBUTE(int,       data_begin)
+DECLARE_ARRAY(int, 1 , data_index)
 
+/*LOCAL */
+DECLARE_ATTRIBUTE(int,       ibegin)
+DECLARE_ATTRIBUTE(int,       ni)
+
+/* LOCAL */
+DECLARE_ARRAY(bool, 1 , mask)

XIOS/trunk/src/config/grid_attribute.conf

@@ -4 +4 @@
 //DECLARE_ATTRIBUTE(StdString, axis_ref)
 DECLARE_ARRAY(bool, 3 , mask)
+//DECLARE_ARRAY(bool, 4 , mask4)
+//DECLARE_ARRAY(bool, 5 , mask5)
+//DECLARE_ARRAY(bool, 6 , mask6)
+//DECLARE_ARRAY(bool, 7 , mask7)
+
 
 // These attributes should be used privately
 // An array contains order of axis and domains composing of the grid
-DECLARE_ARRAY(int, 1 , axisDomOrder)
+DECLARE_ARRAY(bool, 1 , axisDomainOrder)

XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

@@ -17 +17 @@
 {
   typedef xios::CGrid*  grid_Ptr;
-  
-  void cxios_set_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1)
+
+  void cxios_set_grid_axisDomOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
-    grid_hdl->axisDomOrder.reference(tmp.copy());
+    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ;
+    grid_hdl->axisDomainOrder.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
-  void cxios_get_grid_axisDomOrder(grid_Ptr grid_hdl, int* axisDomOrder, int extent1)
+
+  void cxios_get_grid_axisDomOrder(grid_Ptr grid_hdl, bool* axisDomainOrder, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
-    tmp=grid_hdl->axisDomOrder.getInheritedValue() ;
+    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ;
+    tmp=grid_hdl->axisDomainOrder.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_grid_axisDomOrder(grid_Ptr grid_hdl )
   {
      CTimer::get("XIOS").resume();
-    return grid_hdl->axisDomOrder.hasInheritedValue();
+    return grid_hdl->axisDomainOrder.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_grid_description(grid_Ptr grid_hdl, const char * description, int description_size)
   {
@@ -51 +51 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size)
   {
@@ -59 +59 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_grid_description(grid_Ptr grid_hdl )
   {
@@ -66 +66 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3)
   {
@@ -76 +76 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_mask(grid_Ptr grid_hdl, bool* mask, int extent1, int extent2, int extent3)
   {
@@ -84 +84 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_grid_mask(grid_Ptr grid_hdl )
   {
@@ -91 +91 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_grid_name(grid_Ptr grid_hdl, const char * name, int name_size)
   {
@@ -102 +102 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size)
   {
@@ -110 +110 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_grid_name(grid_Ptr grid_hdl )
   {
@@ -117 +117 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
-  
+
+
+
+
 }

XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

@@ -17 +17 @@
 {
   typedef xios::CGridGroup*  gridgroup_Ptr;
-  
-  void cxios_set_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, int* axisDomOrder, int extent1)
+
+  void cxios_set_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
-    gridgroup_hdl->axisDomOrder.reference(tmp.copy());
+    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ;
+    gridgroup_hdl->axisDomainOrder.reference(tmp.copy());
      CTimer::get("XIOS").suspend();
   }
-  
-  void cxios_get_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, int* axisDomOrder, int extent1)
+
+  void cxios_get_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl, bool* axisDomainOrder, int extent1)
   {
     CTimer::get("XIOS").resume();
-    CArray<int,1> tmp(axisDomOrder,shape(extent1),neverDeleteData) ;
-    tmp=gridgroup_hdl->axisDomOrder.getInheritedValue() ;
+    CArray<bool,1> tmp(axisDomainOrder,shape(extent1),neverDeleteData) ;
+    tmp=gridgroup_hdl->axisDomainOrder.getInheritedValue() ;
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_gridgroup_axisDomOrder(gridgroup_Ptr gridgroup_hdl )
   {
      CTimer::get("XIOS").resume();
-    return gridgroup_hdl->axisDomOrder.hasInheritedValue();
+    return gridgroup_hdl->axisDomainOrder.hasInheritedValue();
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_gridgroup_description(gridgroup_Ptr gridgroup_hdl, const char * description, int description_size)
   {
@@ -51 +51 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_gridgroup_description(gridgroup_Ptr gridgroup_hdl, char * description, int description_size)
   {
@@ -59 +59 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_gridgroup_description(gridgroup_Ptr gridgroup_hdl )
   {
@@ -66 +66 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, const char * group_ref, int group_ref_size)
   {
@@ -77 +77 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, char * group_ref, int group_ref_size)
   {
@@ -85 +85 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl )
   {
@@ -92 +92 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3)
   {
@@ -102 +102 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_gridgroup_mask(gridgroup_Ptr gridgroup_hdl, bool* mask, int extent1, int extent2, int extent3)
   {
@@ -110 +110 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_gridgroup_mask(gridgroup_Ptr gridgroup_hdl )
   {
@@ -117 +117 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
+
+
+
   void cxios_set_gridgroup_name(gridgroup_Ptr gridgroup_hdl, const char * name, int name_size)
   {
@@ -128 +128 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   void cxios_get_gridgroup_name(gridgroup_Ptr gridgroup_hdl, char * name, int name_size)
   {
@@ -136 +136 @@
      CTimer::get("XIOS").suspend();
   }
-  
+
   bool cxios_is_defined_gridgroup_name(gridgroup_Ptr gridgroup_hdl )
   {
@@ -143 +143 @@
      CTimer::get("XIOS").suspend();
   }
-  
-  
-  
-  
+
+
+
+
 }

XIOS/trunk/src/node/axis.cpp

@@ -57 +57 @@
       StdSize size = this->size.getValue();
 
+      if (!this->ibegin.isEmpty())
+      {
+        StdSize ibegin = this->ibegin.getValue();
+        if ((ibegin < 0) || (ibegin > size-1))
+          ERROR("CAxis::checkAttributes(void)",<< "Attribut <ibegin> of the axis must be non-negative and smaller than size-1") ;
+      }
+      else this->ibegin.setValue(0);
+
+      if (!this->ni.isEmpty())
+      {
+        StdSize ni = this->ni.getValue();
+        if ((ni < 0) || (ni > size))
+          ERROR("CAxis::checkAttributes(void)",<< "Attribut <ni> of the axis must be non-negative and smaller than size") ;
+      }
+      else this->ni.setValue(size);
+
       StdSize zoom_begin,zoom_end, zoom_size ;
 
-      zoom_begin = (this->zoom_begin.isEmpty()) ?  1 : this->zoom_begin.getValue() ;
-      zoom_end = (this->zoom_end.isEmpty()) ?  size : this->zoom_end.getValue() ;
+//      zoom_begin = (this->zoom_begin.isEmpty()) ?  1 : this->zoom_begin.getValue() ;
+//      zoom_end = (this->zoom_end.isEmpty()) ?  size : this->zoom_end.getValue() ;
+//      zoom_size = (this->zoom_size.isEmpty()) ?  size : this->zoom_size.getValue() ;
+
+      // Maybe index begins at 0 (zero)
+      zoom_begin = (this->zoom_begin.isEmpty()) ?  0 : this->zoom_begin.getValue() ;
+      zoom_end = (this->zoom_end.isEmpty()) ?  size-1 : this->zoom_end.getValue() ;
       zoom_size = (this->zoom_size.isEmpty()) ?  size : this->zoom_size.getValue() ;
 
@@ -66 +87 @@
       if (this->zoom_end.isEmpty()) zoom_end=zoom_begin+zoom_size-1 ;
       if (this->zoom_size.isEmpty()) zoom_size=zoom_end-zoom_begin+1 ;
+//
+//      if ( (zoom_begin < 1) || (zoom_begin > size) || (zoom_end<1) || (zoom_end>size) || (zoom_size<1) || (zoom_size>size) || (zoom_begin>zoom_end))
+//        ERROR("CAxis::checkAttributes(void)",<< "One or more attribut of <zoom_begin>, <zoom_end>, <zoom_size>, are not well specified") ;
 
-      if ( (zoom_begin < 1) || (zoom_begin > size) || (zoom_end<1) || (zoom_end>size) || (zoom_size<1) || (zoom_size>size) || (zoom_begin>zoom_end))
+      if ( (zoom_begin < 0) || (zoom_begin > size-1) || (zoom_end<1) || (zoom_end>size-1) || (zoom_size<1) || (zoom_size>size) || (zoom_begin>zoom_end))
         ERROR("CAxis::checkAttributes(void)",<< "One or more attribut of <zoom_begin>, <zoom_end>, <zoom_size>, are not well specified") ;
+
       this->zoom_begin.setValue(zoom_begin) ;
       this->zoom_end.setValue(zoom_end) ;
@@ -78 +103 @@
                << "The array \'value\' has a different size that the one defined by the \'size\' attribut")
 
+      this->checkData();
+      this->checkMask();
       this->isChecked = true;
+   }
+
+   void CAxis::checkData()
+   {
+      if (data_begin.isEmpty()) data_begin.setValue(0);
+      if (!data_n.isEmpty() && data_n.getValue() <= 0)
+      {
+        ERROR("CAxis::checkData(void)",
+              << "Data dimension is negative (data_n).") ;
+      }
+      else if (data_n.isEmpty())
+        data_n.setValue(zoom_size.getValue());
+
+      if (data_index.isEmpty())
+      {
+        int dn = data_n.getValue();
+        data_index.resize(dn);
+        for (int i = 0; i < dn; ++i) data_index(i) = (i+1);
+      }
+   }
+
+   void CAxis::checkMask()
+   {
+      int begin_mask = 0,
+          end_mask = ni.getValue()-1;
+
+      if (!zoom_begin.isEmpty())
+      {
+         int zoom_end = zoom_begin.getValue() + zoom_size.getValue() - 1;
+
+         begin_mask = std::max(ibegin.getValue(), zoom_begin.getValue());
+         end_mask   = std::min(ibegin.getValue() + ni.getValue()-1, zoom_end);
+
+         begin_mask -= ibegin.getValue();
+         end_mask   -= ibegin.getValue();
+      }
+
+
+      if (!mask.isEmpty())
+      {
+         if (mask.extent(0) != ni)
+            ERROR("CAxis::checkMask(void)",
+                  <<"the mask has not the same size than the local axis"<<endl
+                  <<"Local size is "<<ni<<"x"<<endl
+                  <<"Mask size is "<<mask.extent(0)<<"x");
+         for (int i = 0; i < ni; ++i)
+         {
+           if (i < begin_mask && i > end_mask)  mask(i) = false;
+         }
+      }
+      else // (!mask.hasValue())
+      { // Si aucun masque n'est défini,
+        // on en crée un nouveau qui valide l'intégralité du domaine.
+         mask.resize(ni) ;
+         for (int i = 0; i < ni.getValue(); ++i)
+         {
+               if (i >= begin_mask && i <= end_mask)
+                 mask(i) = true;
+               else  mask(i) = false;
+         }
+      }
    }
 

XIOS/trunk/src/node/axis.hpp

@@ -70 +70 @@
 
       private :
-
+         void checkData();
+         void checkMask();
          bool isChecked;
          std::set<StdString> relFiles;

XIOS/trunk/src/node/domain.cpp

@@ -109 +109 @@
          }
          ni=1 ;
-         ibegin=1 ;
-         iend=1 ;
+         ibegin=0 ;
+         iend=0 ;
 
       }
@@ -169 +169 @@
 
       if (ni.getValue() < 0 || ibegin.getValue() > iend.getValue() ||
-          ibegin.getValue() < 1 || iend.getValue() > ni_glo.getValue())
+          ibegin.getValue() < 0 || iend.getValue() > (ni_glo.getValue()-1))
           {
 
@@ -207 +207 @@
 
       if (nj.getValue() < 0 || jbegin.getValue() > jend.getValue() ||
-          jbegin.getValue() < 1 || jend.getValue() > nj_glo.getValue())
+          jbegin.getValue() < 0 || jend.getValue() > (nj_glo.getValue()-1))
          ERROR("CDomain::checkAttributes(void)",
                << "Domain is wrong defined,"
@@ -488 +488 @@
             int zoom_jend = zoom_jbegin + zoom_nj - 1;
 
-            if (zoom_ibegin < 1  || zoom_jbegin < 1 || zoom_iend > ni_glo || zoom_jend > nj_glo)
+            if (zoom_ibegin < 0  || zoom_jbegin < 0 || zoom_iend > (ni_glo-1) || zoom_jend > (nj_glo-1))
                ERROR("CDomain::checkZoom(void)",
                      << "Zoom is wrong defined,"
@@ -498 +498 @@
          zoom_ni = ni_glo;
          zoom_nj = nj_glo;
-         zoom_ibegin = 1;
-         zoom_jbegin = 1;
+         zoom_ibegin = 0;
+         zoom_jbegin = 0;
       }
 
@@ -613 +613 @@
   {
     int ni_srv=ni_glo.getValue() ;
-    int ibegin_srv=1 ;
+    int ibegin_srv=0 ;
     int iend_srv=ni_glo.getValue() ;
 
@@ -625 +625 @@
     int serverRank=client->getServerLeader() ;
 
-    jend_srv=0 ;
+//    jend_srv=0 ;
+    jend_srv= -1 ;
     for(int i=0;i<=serverRank;i++)
     {
@@ -664 +665 @@
     int ns=nj_glo%nbServer ;
     int pos=ns*(blockSize+1) ;
+//    int pos=ns*(blockSize) ;
     int serverNum ;
 
@@ -674 +676 @@
       for(i=0;i<ni;i++)
       {
-        i_ind=ibegin+i_index(i,j)-1 ;
-        j_ind=jbegin+j_index(i,j)-1 ;
+        i_ind=ibegin+i_index(i,j) ;
+        j_ind=jbegin+j_index(i,j) ;
 
         if (j_ind<pos) serverNum=j_ind/(blockSize+1) ;
@@ -681 +683 @@
         IsConnected[serverNum]=true ;
 
-        if (i_ind >= zoom_ibegin-1 && i_ind <= zoom_iend-1 && j_ind >= zoom_jbegin-1 && j_ind <= zoom_jend-1)
+        if (i_ind >= zoom_ibegin && i_ind <= zoom_iend && j_ind >= zoom_jbegin && j_ind <= zoom_jend)
         {
           mapConnectedServer(i,j)=serverNum ;
@@ -709 +711 @@
           ns=indServer[mapConnectedServer(i,j)] ;
           mapConnectedServer(i,j)= ns ;
-          i_indSrv[ns].push_back(i+ibegin-1) ;
-          j_indSrv[ns].push_back(j+jbegin-1) ;
+          i_indSrv[ns].push_back(i+ibegin) ;
+          j_indSrv[ns].push_back(j+jbegin) ;
         }
       }
@@ -743 +745 @@
   }
 
+
+//  void CDomain::sendLonLat(void)
+//  {
+//    int ns,n,i,j,ind,nv ;
+//    CContext* context = CContext::getCurrent() ;
+//    CContextClient* client=context->client ;
+//    // send lon lat for each connected server
+//
+//    CEventClient eventLon(getType(),EVENT_ID_LON) ;
+//    CEventClient eventLat(getType(),EVENT_ID_LAT) ;
+//
+//    list<shared_ptr<CMessage> > list_msgLon ;
+//    list<shared_ptr<CMessage> > list_msgLat ;
+//    list< CArray<int,1>* > list_indi,list_indj ;
+//    list< CArray<double,1>* >list_lon,list_lat ;
+//    list< CArray<double,2>* >list_boundslon,list_boundslat ;
+//
+//    for(int ns=0;ns<connectedServer.size();ns++)
+//    {
+//      int nbData = nbDataSrv[ns] ;
+//      CArray<int,1> indi(nbData) ;
+//      CArray<int,1> indj(nbData) ;
+//      CArray<double,1> lon(nbData) ;
+//      CArray<double,1> lat(nbData) ;
+//      CArray<double,2> boundslon(nvertex,nbData) ;
+//      CArray<double,2> boundslat(nvertex,nbData) ;
+//
+//      for(n=0;n<nbData;n++)
+//      {
+//        i=i_indSrv[ns][n] ;
+//        j=j_indSrv[ns][n] ;
+//        ind=(i-(zoom_ibegin_client-1))+(j-(zoom_jbegin_client-1))*zoom_ni_client ;
+//
+//        lon(n)=lonvalue(ind) ;
+//        lat(n)=latvalue(ind) ;
+//        if (hasBounds)
+//        {
+//          for(nv=0;nv<nvertex;nv++)
+//          {
+//            boundslon(nv,n)=bounds_lon(nv,ind);
+//            boundslat(nv,n)=bounds_lat(nv,ind);
+//          }
+//        }
+//        indi(n)=ibegin+i_index(i-ibegin+1,j-jbegin+1)-1  ;
+//        indj(n)=jbegin+j_index(i-ibegin+1,j-jbegin+1)-1  ;
+//      }
+//
+//      list_indi.push_back(new CArray<int,1>(indi.copy())) ;
+//      list_indj.push_back(new CArray<int,1>(indj.copy())) ;
+//      list_lon.push_back(new CArray<double,1>(lon.copy())) ;
+//      list_lat.push_back(new CArray<double,1>(lat.copy())) ;
+//      if (hasBounds) list_boundslon.push_back(new CArray<double,2>(boundslon.copy())) ;
+//      if (hasBounds) list_boundslat.push_back(new CArray<double,2>(boundslat.copy())) ;
+//
+//      list_msgLon.push_back(shared_ptr<CMessage>(new CMessage)) ;
+//      list_msgLat.push_back(shared_ptr<CMessage>(new CMessage)) ;
+//
+//      *list_msgLon.back()<<this->getId()<<(int)type ; // enum ne fonctionne pour les message => ToFix
+//      *list_msgLat.back()<<this->getId()<<(int)type ;
+//      *list_msgLon.back()<<isCurvilinear ;
+//      *list_msgLat.back()<<isCurvilinear ;
+//      *list_msgLon.back()<<*list_indi.back()<<*list_indj.back()<<*list_lon.back() ;
+//      *list_msgLat.back()<<*list_indi.back()<<*list_indj.back()<<*list_lat.back() ;
+//
+//      if (hasBounds)
+//      {
+//        *list_msgLon.back()<<*list_boundslon.back();
+//        *list_msgLat.back()<<*list_boundslat.back();
+//      }
+//      eventLon.push(connectedServer[ns],nbSenders[ns],*list_msgLon.back()) ;
+//      eventLat.push(connectedServer[ns],nbSenders[ns],*list_msgLat.back()) ;
+//    }
+//
+//    client->sendEvent(eventLon) ;
+//    client->sendEvent(eventLat) ;
+//
+//
+//    for(list<CArray<int,1>* >::iterator it=list_indi.begin();it!=list_indi.end();it++) delete *it;
+//    for(list<CArray<int,1>* >::iterator it=list_indj.begin();it!=list_indj.end();it++) delete *it;
+//    for(list<CArray<double,1>* >::iterator it=list_lon.begin();it!=list_lon.end();it++)   delete *it;
+//    for(list<CArray<double,1>* >::iterator it=list_lat.begin();it!=list_lat.end();it++)   delete *it;
+//    if (hasBounds) for(list<CArray<double,2>* >::iterator it=list_boundslon.begin();it!=list_boundslon.end();it++)   delete *it;
+//    if (hasBounds) for(list<CArray<double,2>* >::iterator it=list_boundslat.begin();it!=list_boundslat.end();it++)   delete *it;
+//
+//  }
 
   void CDomain::sendLonLat(void)
@@ -774 +861 @@
         i=i_indSrv[ns][n] ;
         j=j_indSrv[ns][n] ;
-        ind=(i-(zoom_ibegin_client-1))+(j-(zoom_jbegin_client-1))*zoom_ni_client ;
+//        ind=(i-(zoom_ibegin_client))+(j-(zoom_jbegin_client-1))*zoom_ni_client ;
+        ind=(i-(zoom_ibegin_client))+(j-(zoom_jbegin_client))*zoom_ni_client ;
 
         lon(n)=lonvalue(ind) ;
@@ -786 +874 @@
           }
         }
-        indi(n)=ibegin+i_index(i-ibegin+1,j-jbegin+1)-1  ;
-        indj(n)=jbegin+j_index(i-ibegin+1,j-jbegin+1)-1  ;
+        indi(n)=ibegin+i_index(i-ibegin,j-jbegin)  ;
+        indj(n)=jbegin+j_index(i-ibegin,j-jbegin)  ;
+//        indi(n)=ibegin+i_index(i-ibegin+1,j-jbegin+1)-1  ;
+//        indj(n)=jbegin+j_index(i-ibegin+1,j-jbegin+1)-1  ;
       }
 
@@ -828 +918 @@
 
   }
-
 
   bool CDomain::dispatchEvent(CEventServer& event)
@@ -884 +973 @@
     if (zoom_ni_srv<=0 || zoom_nj_srv<=0)
     {
-      zoom_ibegin_srv=1 ; zoom_iend_srv=0 ; zoom_ni_srv=0 ;
-      zoom_jbegin_srv=1 ; zoom_jend_srv=0 ; zoom_nj_srv=0 ;
+      zoom_ibegin_srv=0 ; zoom_iend_srv=0 ; zoom_ni_srv=0 ;
+      zoom_jbegin_srv=0 ; zoom_jend_srv=0 ; zoom_nj_srv=0 ;
     }
     lonvalue_srv.resize(zoom_ni_srv*zoom_nj_srv) ;
@@ -928 +1017 @@
     {
       i=indi(ind) ; j=indj(ind) ;
-      ind_srv=(i-(zoom_ibegin_srv-1))+(j-(zoom_jbegin_srv-1))*zoom_ni_srv ;
+      ind_srv=(i-(zoom_ibegin_srv))+(j-(zoom_jbegin_srv))*zoom_ni_srv ;
       lonvalue_srv(ind_srv)=lon(ind) ;
       if (hasBounds)
@@ -968 +1057 @@
     {
       i=indi(ind) ; j=indj(ind) ;
-      ind_srv=(i-(zoom_ibegin_srv-1))+(j-(zoom_jbegin_srv-1))*zoom_ni_srv ;
+      ind_srv=(i-(zoom_ibegin_srv))+(j-(zoom_jbegin_srv))*zoom_ni_srv ;
       latvalue_srv(ind_srv)=lat(ind) ;
       if (hasBounds)

XIOS/trunk/src/node/domain.hpp

@@ -151 +151 @@
          bool isChecked;
          std::set<StdString> relFiles;
-         bool isClientChecked; // Verify whether all attributes of domain on the client side is good
+         bool isClientChecked; // Verify whether all attributes of domain on the client side are good
 
          DECLARE_REF_FUNC(Domain,domain)

XIOS/trunk/src/node/field.cpp

@@ -152 +152 @@
     list< CArray<double,1>* > list_data ;
 
-    for(it=grid->storeIndex_toSrv.begin();it!=grid->storeIndex_toSrv.end();it++)
+     for(it=grid->storeIndex_toSrv.begin();it!=grid->storeIndex_toSrv.end();it++)
     {
       int rank=(*it).first ;
       CArray<int,1>& index = *(it->second) ;
       CArray<double,1> data_tmp(index.numElements()) ;
-
       for(int n=0;n<data_tmp.numElements();n++) data_tmp(n)=data(index(n)) ;
       list_msg.push_back(shared_ptr<CMessage>(new CMessage)) ;
@@ -193 +192 @@
     if (data_srv.empty())
     {
-      for(map<int, CArray<int, 1>* >::iterator it=grid->out_i_fromClient.begin();it!=grid->out_i_fromClient.end();it++)
+//      for(map<int, CArray<int, 1>* >::iterator it=grid->out_i_fromClient.begin();it!=grid->out_i_fromClient.end();it++)
+      for(map<int, CArray<size_t, 1>* >::iterator it=grid->outIndexFromClient.begin();it!=grid->outIndexFromClient.end();++it)
       {
         int rank=it->first ;
@@ -683 +683 @@
       map<int, CArray<double,1>* >::iterator it;
       for(it=data_srv.begin();it!=data_srv.end();it++)
+      {
+        grid->outputField(it->first,*it->second, fieldOut.dataFirst()) ;
+      }
+
+//         grid->outputField(it->first,*it->second, fieldOut.) ;
+
+   }
+
+   void CField::outputField(CArray<double,2>& fieldOut)
+   {
+      map<int, CArray<double,1>* >::iterator it;
+
+      for(it=data_srv.begin();it!=data_srv.end();it++)
+      {
          grid->outputField(it->first,*it->second, fieldOut) ;
-
-   }
-
-   void CField::outputField(CArray<double,2>& fieldOut)
-   {
-      map<int, CArray<double,1>* >::iterator it;
-
-      for(it=data_srv.begin();it!=data_srv.end();it++)
-      {
-         grid->outputField(it->first,*it->second, fieldOut) ;
-      }
-   }
+      }
+   }
+
    ///-------------------------------------------------------------------
 

XIOS/trunk/src/node/grid.cpp

@@ -21 +21 @@
       , withAxis(false), isChecked(false), isDomainAxisChecked(false), axis(), domain()
       , storeIndex(1), out_i_index(1), out_j_index(1), out_l_index(1), isDomConServerComputed_(false)
-      , vDomainGroup_(), vAxisGroup_(), axisOrder_(), axisList_(), isAxisListSet(false), isDomListSet(false)
+      , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
    {
      setVirtualDomainGroup();
@@ -31 +31 @@
       , withAxis(false), isChecked(false), isDomainAxisChecked(false), axis(), domain()
       , storeIndex(1), out_i_index(1), out_j_index(1), out_l_index(1), isDomConServerComputed_(false)
-      , vDomainGroup_(), vAxisGroup_(), axisOrder_(), axisList_(), isAxisListSet(false), isDomListSet(false)
+      , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
    {
      setVirtualDomainGroup();
@@ -51 +51 @@
     for(map<int,CArray<int,1>* >::iterator it=out_j_fromClient.begin();it!=out_j_fromClient.end();it++) delete it->second ;
     for(map<int,CArray<int,1>* >::iterator it=out_l_fromClient.begin();it!=out_l_fromClient.end();it++) delete it->second ;
+
+    for(map<int,CArray<size_t,1>* >::iterator it=outIndexFromClient.begin();it!=outIndexFromClient.end();++it) delete (it->second);
+
+    if (0 != clientDistribution_) delete clientDistribution_;
 
    }
@@ -176 +180 @@
    std::map<int, StdSize> CGrid::getConnectedServerDataSize()
    {
+     double secureFactor = 2.5 * sizeof(double) * CXios::bufferServerFactorSize;
+     StdSize retVal;
      std::map<int, StdSize> ret;
-     std::map<int, int>::const_iterator it = domConnectedServerSide_.begin(),
-                                       itE = domConnectedServerSide_.end();
-     std::vector<int> nData = domain->nbDataSrv;
-     std::vector<int>::const_iterator itData = nData.begin();
-     StdSize retVal = StdSize(0.0);
-     for (; it != itE; ++it, ++itData)
+     const std::map<int, std::vector<int> >& distribution = clientDistribution_->getLocalIndexSendToServer();
+     std::map<int, std::vector<int> >::const_iterator it = distribution.begin(), itE = distribution.end();
+     for (; it != itE; ++it)
      {
-       retVal = (it->second < *itData) ? *itData : it->second;
-       if (this->withAxis) retVal *= this->axis->size.getValue();
-       retVal *= sizeof(double);
-       retVal *= 2.5 * CXios::bufferServerFactorSize; // Secure factor, myterious number
-       ret.insert(make_pair(it->first, retVal));
+        retVal = it->second.size();
+        retVal *= secureFactor;
+        ret.insert(std::make_pair<int,StdSize>(it->first, retVal));
      }
+
      return ret;
    }
@@ -235 +237 @@
 
      if (context->hasClient)
-      if (this->isChecked && doSendingIndex) sendIndex();
+      if (this->isChecked && doSendingIndex && !isIndexSent) { sendIndex(); this->isIndexSent = true; }
 
      if (this->isChecked) return;
@@ -397 +399 @@
    void CGrid::computeIndex(void)
    {
-
+     CContext* context = CContext::getCurrent() ;
+     CContextClient* client=context->client ;
+     clientDistribution_ = new CDistributionClient(client->clientRank, this);
+     clientDistribution_->computeServerIndexMapping(client->serverSize);
+     nbSenders = clientDistribution_->computeConnectedClients(client->serverSize, client->clientSize, client->intraComm);
+
+     storeIndex_client.resize(clientDistribution_->getLocalDataIndexOnClient().numElements());
+     storeIndex_client = (clientDistribution_->getLocalDataIndexOnClient());
+
+/*
       const int ni   = domain->ni.getValue() ,
                 nj   = domain->nj.getValue() ,
@@ -476 +487 @@
          }
       }
-      computeDomConServer();
+*/
+//      computeDomConServer();
 //      sendIndex() ;
 
@@ -520 +532 @@
       grid->setDomainList(domains);
       grid->setAxisList(axis);
+
+      //By default, domains are always the first ones of a grid
+      if (grid->axisDomainOrder.isEmpty())
+      {
+        int size = domains.size()+axis.size();
+        grid->axisDomainOrder.resize(size);
+        for (int i = 0; i < size; ++i)
+        {
+          if (i < domains.size()) grid->axisDomainOrder(i) = true;
+          else grid->axisDomainOrder(i) = false;
+        }
+      }
+
       return (grid);
    }
@@ -561 +586 @@
       for(StdSize n = 0; n < stored.numElements(); n++)
          field(out_i(n)) = stored(n) ;
+   }
+
+   void CGrid::outputField(int rank, const CArray<double, 1>& stored, double* field)
+   {
+     CArray<size_t,1>& out_i=*outIndexFromClient[rank];
+     StdSize numElements = stored.numElements();
+     for (StdSize n = 0; n < numElements; ++n)
+     {
+       *(field+out_i(n)) = stored(n);
+     }
    }
 
@@ -599 +634 @@
 //         if (domain->mapConnectedServer(i,j)==ns)  nb++ ;
 //       }
-//
 //       CArray<int,1> storeIndex(nb) ;
 //       CArray<int,1> out_i(nb) ;
@@ -676 +710 @@
     int rank ;
     list<shared_ptr<CMessage> > list_msg ;
-    list< CArray<int,1>* > list_out_i,list_out_j,list_out_l ;
-
+    list< CArray<size_t,1>* > listOutIndex;
+
+    const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientDistribution_->getGlobalIndexOnServer();
+    const std::map<int, std::vector<int> >& localIndexSendToServer  = clientDistribution_->getLocalIndexSendToServer();
+
+    std::map<int, std::vector<size_t> >::const_iterator iteMap, itbMap, itGlobal;
+    std::map<int, std::vector<int> >::const_iterator itLocal;
+    itbMap = itGlobal = globalIndexOnServer.begin();
+    iteMap = globalIndexOnServer.end();
+    itLocal = localIndexSendToServer.begin();
+
+
+    for (int ns = 0; itGlobal != iteMap; ++itGlobal, ++itLocal, ++ns)
+    {
+      rank = itGlobal->first;
+      int nb = (itGlobal->second).size();
+
+      CArray<size_t, 1> outGlobalIndexOnServer(nb);
+      CArray<int, 1> outLocalIndexToServer(nb);
+      for (int k = 0; k < nb; ++k)
+      {
+        outGlobalIndexOnServer(k) = itGlobal->second.at(k);
+        outLocalIndexToServer(k)  = itLocal->second.at(k);
+      }
+
+      storeIndex_toSrv.insert( pair<int,CArray<int,1>* >(rank,new CArray<int,1>(outLocalIndexToServer) ));
+      listOutIndex.push_back(new CArray<size_t,1>(outGlobalIndexOnServer));
+
+      list_msg.push_back(shared_ptr<CMessage>(new CMessage));
+      *list_msg.back()<<getId()<<*listOutIndex.back();
+      event.push(rank, nbSenders[rank], *list_msg.back());
+    }
+    client->sendEvent(event);
+    for(list<CArray<size_t,1>* >::iterator it=listOutIndex.begin();it!=listOutIndex.end();++it) delete *it ;
+
+/*
     if (!isDomConServerComputed_) computeDomConServer();
 
@@ -721 +789 @@
     for(list<CArray<int,1>* >::iterator it=list_out_j.begin();it!=list_out_j.end();it++) delete *it ;
     for(list<CArray<int,1>* >::iterator it=list_out_l.begin();it!=list_out_l.end();it++) delete *it ;
-
+*/
   }
 
@@ -731 +799 @@
       int rank=it->rank;
       CBufferIn* buffer=it->buffer;
-      string domainId ;
-      *buffer>>domainId ;
-      get(domainId)->recvIndex(rank,*buffer) ;
+      string gridId ;
+      *buffer>>gridId ;
+      get(gridId)->recvIndex(rank,*buffer) ;
     }
   }
@@ -739 +807 @@
   void CGrid::recvIndex(int rank, CBufferIn& buffer)
   {
+     CArray<size_t,1> outIndex;
+     buffer>>outIndex;
+     outIndexFromClient.insert(std::pair<int, CArray<size_t,1>* >(rank, new CArray<size_t,1>(outIndex)));
+
+    /*
     CArray<int,1> out_i ;
     CArray<int,1> out_j ;
@@ -751 +824 @@
     out_j_fromClient.insert(pair< int,CArray<int,1>* >(rank,new CArray<int,1>(out_j) )) ;
     out_l_fromClient.insert(pair< int,CArray<int,1>* >(rank,new CArray<int,1>(out_l) )) ;
+    */
   }
 
@@ -947 +1021 @@
    }
 
+  /*!
+  \brief Solve domain and axis references
+  As field, domain and axis can refer to other domains or axis. In order to inherit correctly
+  all attributes from their parents, they should be processed with this function
+  \param[in] apply inherit all attributes of parents (true)
+  */
   void CGrid::solveDomainAxisRefInheritance(bool apply)
   {
@@ -963 +1043 @@
         if ((!pDom->domain_ref.isEmpty()) && (pDom->name.isEmpty()))
           pDom->name.setValue(pDom->getBaseDomainReference()->getId());
-
       }
     }
@@ -982 +1061 @@
   }
 
+  /*!
+  \brief Get the list of domain pointers
+  \return list of domain pointers
+  */
   std::vector<CDomain*> CGrid::getDomains()
   {
@@ -992 +1075 @@
   }
 
+  /*!
+  \brief Get the list of  axis pointers
+  \return list of axis pointers
+  */
   std::vector<CAxis*> CGrid::getAxis()
   {
@@ -1001 +1088 @@
   }
 
+  /*!
+  \brief Set domain(s) of a grid from a list
+  \param[in] domains list of domains
+  */
   void CGrid::setDomainList(const std::vector<CDomain*> domains)
   {
@@ -1019 +1110 @@
   }
 
+  /*!
+  \brief Set axis(s) of a grid from a list
+  \param[in] axis list of axis
+  */
   void CGrid::setAxisList(const std::vector<CAxis*> axis)
   {
@@ -1036 +1131 @@
   }
 
+  /*!
+  \brief Get list of id of domains
+  \return id list of domains
+  */
   std::vector<StdString> CGrid::getDomainList()
   {
@@ -1042 +1141 @@
   }
 
+  /*!
+  \brief Get list of id of axis
+  \return id list of axis
+  */
   std::vector<StdString> CGrid::getAxisList()
   {
@@ -1074 +1177 @@
   {
     SuperClass::parse(node);
+    // List order of axis and domain in a grid, if there is a domain, it will take value 1 (true), axis 0 (false)
+//    std::vector<int> axisOrder;
+    std::vector<bool> order;
 
     if (node.goToChildElement())
     {
-      int domainIdx = -1;
-      int posAxis = 0;
       StdString domainName("domain");
       StdString axisName("axis");
@@ -1084 +1188 @@
       {
         if (node.getElementName() == domainName) {
-          axisOrder_.push_back(domainIdx);
+          order.push_back(true);
           this->getVirtualDomainGroup()->parseChild(node);
         }
         if (node.getElementName() == axisName) {
-          axisOrder_.push_back(posAxis);
-          ++posAxis;
+          order.push_back(false);
           this->getVirtualAxisGroup()->parseChild(node);
         }
@@ -1096 +1199 @@
     }
 
-    if (!axisOrder_.empty())
-    {
-      int sizeOrd = axisOrder_.size();
-      axisDomOrder.resize(sizeOrd);
+    if (!order.empty())
+    {
+      int sizeOrd = order.size();
+      axisDomainOrder.resize(sizeOrd);
       for (int i = 0; i < sizeOrd; ++i)
       {
-        axisDomOrder(i) = axisOrder_[i];
+        axisDomainOrder(i) = order[i];
       }
     }

XIOS/trunk/src/node/grid.hpp

@@ -11 +11 @@
 #include "array_new.hpp"
 #include "attribute_array.hpp"
+#include "distribution_client.hpp"
 
 namespace xios {
@@ -21 +22 @@
    class CAxisGroup;
    class CGrid;
+   class CDistributionClient;
 
    ///--------------------------------------------------------------
@@ -97 +99 @@
          void outputField(int rank, const CArray<double,1>& stored,  CArray<double,2>& field)  ;
          void outputField(int rank, const CArray<double,1>& stored,  CArray<double,1>& field)  ;
+         void outputField(int rank, const CArray<double,1>& stored,  double* field);
 
          virtual void parse(xml::CXMLNode & node);
@@ -154 +157 @@
          std::vector<CDomain*> getDomains();
          std::vector<CAxis*> getAxis();
+         std::vector<int> getAxisOrder();
 
       public:
@@ -161 +165 @@
          bool isChecked;
          bool isDomainAxisChecked;
+         bool isIndexSent;
 
          CAxis*   axis ;
@@ -184 +189 @@
          map<int, CArray<int, 1>* > out_j_fromClient ;
          map<int, CArray<int, 1>* > out_l_fromClient ;
+
+         map<int, CArray<size_t, 1>* > outIndexFromClient;
          void checkMask(void) ;
 
@@ -209 +216 @@
         std::vector<std::string> axisList_, domList_;
         bool isAxisListSet, isDomListSet;
-
-        // List order of axis in a grid, if there is a domain, it will take value -1
-        std::vector<int> axisOrder_;
+        CDistributionClient* clientDistribution_;
    }; // class CGrid
 

XIOS/trunk/src/test/test_new_features.f90

@@ -56 +56 @@
     ENDDO
   ENDDO
-  ni=ni_glo ; ibegin=1
+  ni=ni_glo ; ibegin=0
 
-  jbegin=1
+  jbegin=0
   DO n=0,size-1
     nj=nj_glo/size
@@ -72 +72 @@
   lon(:,:)=lon_glo(ibegin:iend,jbegin:jend)
   lat(:,:)=lat_glo(ibegin:iend,jbegin:jend)
-  field_A(1:ni,1:nj,:)=field_A_glo(ibegin:iend,jbegin:jend,:)
+  field_A(1:ni,1:nj,:)=field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
 
   CALL xios_context_initialize("test",comm)