Changeset 821 for XIOS/trunk/src/node

Timestamp:

02/10/16 14:35:03 (8 years ago)

Author:

mhnguyen

Message:

Making some improvements of transformation algorithm

+) Correct the way to enlisting transformations in an element (domain, axis)
+) Optimize generic transformation to make sure temporary grid to be created on demand
+) Update some mpi tag to prevent conflict
+) Correct some minor stuffs
+) Update documents

Test
+) On Curie
+) all test pass

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (7 diffs)
• axis.hpp (modified) (2 diffs)
• domain.cpp (modified) (5 diffs)
• domain.hpp (modified) (3 diffs)
• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -26 +26 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0), hasValue(false)
+      , transformationMap_(), hasValue(false)
    {
    }
@@ -35 +35 @@
       , isDistributed_(false), hasBounds_(false), isCompressible_(false)
       , numberWrittenIndexes_(0), totalNumberWrittenIndexes_(0), offsetWrittenIndexes_(0)
-      , transformationMap_(), global_zoom_begin(0), global_zoom_size(0), hasValue(false)
+      , transformationMap_(), hasValue(false)
    {
    }
@@ -266 +266 @@
    void CAxis::checkZoom(void)
    {
-     if (0 == global_zoom_size) global_zoom_size = this->n_glo.getValue();
+     if (global_zoom_begin.isEmpty()) global_zoom_begin.setValue(0);
+     if (global_zoom_n.isEmpty()) global_zoom_n.setValue(n_glo.getValue());
    }
 
@@ -391 +392 @@
     size_t ni = this->n.getValue();
     size_t ibegin = this->begin.getValue();
-    size_t zoom_end = global_zoom_begin+global_zoom_size-1;
+    size_t zoom_end = global_zoom_begin+global_zoom_n-1;
     size_t nZoomCount = 0;
     size_t nbIndex = index.numElements();
@@ -517 +518 @@
     CEventClient event(getType(), EVENT_ID_NON_DISTRIBUTED_VALUE);
 
-    int zoom_end = global_zoom_begin + global_zoom_size - 1;
+    int zoom_end = global_zoom_begin + global_zoom_n - 1;
     int nb = 0;
     for (size_t idx = 0; idx < n; ++idx)
@@ -830 +831 @@
         msg << this->getId();
         msg << ni << begin << end;
-        msg << global_zoom_begin << global_zoom_size;
+        msg << global_zoom_begin.getValue() << global_zoom_n.getValue();
         msg << isCompressible_;
 
@@ -850 +851 @@
   void CAxis::recvServerAttribut(CBufferIn& buffer)
   {
-    int ni_srv, begin_srv, end_srv, global_zoom_begin_tmp, global_zoom_size_tmp;
+    int ni_srv, begin_srv, end_srv, global_zoom_begin_tmp, global_zoom_n_tmp;
 
     buffer >> ni_srv >> begin_srv >> end_srv;
-    buffer >> global_zoom_begin_tmp >> global_zoom_size_tmp;
+    buffer >> global_zoom_begin_tmp >> global_zoom_n_tmp;
     buffer >> isCompressible_;
     global_zoom_begin = global_zoom_begin_tmp;
-    global_zoom_size  = global_zoom_size_tmp;
-    int global_zoom_end = global_zoom_begin + global_zoom_size - 1;
+    global_zoom_n  = global_zoom_n_tmp;
+    int global_zoom_end = global_zoom_begin + global_zoom_n - 1;
 
     zoom_begin_srv = global_zoom_begin > begin_srv ? global_zoom_begin : begin_srv ;

XIOS/trunk/src/node/axis.hpp

@@ -29 +29 @@
    BEGIN_DECLARE_ATTRIBUTE_MAP(CAxis)
 #  include "axis_attribute.conf"
+#  include "axis_attribute_private.conf"
    END_DECLARE_ATTRIBUTE_MAP(CAxis)
 
@@ -116 +117 @@
         int zoom_begin_srv, zoom_end_srv, zoom_size_srv;
         int ni_srv, begin_srv, end_srv;
-        int global_zoom_begin, global_zoom_size;  // The real global zoom begin and zoom size after axis is transformed (zoomed)
         CArray<double,1> value_srv;
         CArray<double,2> bound_srv;

XIOS/trunk/src/node/domain.cpp

@@ -32 +32 @@
       , isChecked(false), relFiles(), isClientChecked(false), nbConnectedClients_(), indSrv_(), connectedServerRank_()
       , hasBounds(false), hasArea(false), isDistributed_(false), nGlobDomain_(), isCompressible_(false), isUnstructed_(false)
-      , global_zoom_ni(0), global_zoom_ibegin(0), global_zoom_nj(0), global_zoom_jbegin(0)
       , isClientAfterTransformationChecked(false), hasLonLat(false)
       , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client()
@@ -42 +41 @@
       , isChecked(false), relFiles(), isClientChecked(false), nbConnectedClients_(), indSrv_(), connectedServerRank_()
       , hasBounds(false), hasArea(false), isDistributed_(false), nGlobDomain_(), isCompressible_(false), isUnstructed_(false)
-      , global_zoom_ni(0), global_zoom_ibegin(0), global_zoom_nj(0), global_zoom_jbegin(0)
       , isClientAfterTransformationChecked(false), hasLonLat(false)
       , lonvalue_client(), latvalue_client(), bounds_lon_client(), bounds_lat_client()
@@ -663 +661 @@
      }
      computeNGlobDomain();
-
-     if (0 == global_zoom_ni) global_zoom_ni = ni_glo;
-     if (0 == global_zoom_nj) global_zoom_nj = nj_glo;
+     checkZoom();
+   }
+
+   void CDomain::checkZoom(void)
+   {
+     if (global_zoom_ibegin.isEmpty())
+      global_zoom_ibegin.setValue(0);
+     if (global_zoom_ni.isEmpty())
+      global_zoom_ni.setValue(ni_glo);
+     if (global_zoom_jbegin.isEmpty())
+      global_zoom_jbegin.setValue(0);
+     if (global_zoom_nj.isEmpty())
+      global_zoom_nj.setValue(nj_glo);
    }
 
@@ -1253 +1261 @@
         msg << this->getId() ;
         msg << ni_srv << ibegin_srv << iend_srv << nj_srv << jbegin_srv << jend_srv;
-        msg << global_zoom_ni << global_zoom_ibegin << global_zoom_nj << global_zoom_jbegin;
+        msg << global_zoom_ni.getValue() << global_zoom_ibegin.getValue() << global_zoom_nj.getValue() << global_zoom_jbegin.getValue();
         msg << isCompressible_;
 
@@ -1680 +1688 @@
   void CDomain::recvServerAttribut(CBufferIn& buffer)
   {
+    int global_zoom_ni_tmp, global_zoom_ibegin_tmp, global_zoom_nj_tmp, global_zoom_jbegin_tmp;
     buffer >> ni_srv >> ibegin_srv >> iend_srv >> nj_srv >> jbegin_srv >> jend_srv
-           >> global_zoom_ni >> global_zoom_ibegin >> global_zoom_nj >> global_zoom_jbegin
+           >> global_zoom_ni_tmp >> global_zoom_ibegin_tmp >> global_zoom_nj_tmp >> global_zoom_jbegin_tmp
            >> isCompressible_;
+
+    global_zoom_ni.setValue(global_zoom_ni_tmp);
+    global_zoom_ibegin.setValue(global_zoom_ibegin_tmp);
+    global_zoom_nj.setValue(global_zoom_nj_tmp);
+    global_zoom_jbegin.setValue(global_zoom_jbegin_tmp);
 
     int zoom_iend = global_zoom_ibegin + global_zoom_ni - 1;

XIOS/trunk/src/node/domain.hpp

@@ -95 +95 @@
          bool isCompressible(void) const;
 
-         int global_zoom_ibegin, global_zoom_ni;
-         int global_zoom_jbegin, global_zoom_nj;
-
          int ni_srv,ibegin_srv,iend_srv ;
          int zoom_ni_srv,zoom_ibegin_srv,zoom_iend_srv ;
@@ -124 +121 @@
          void sendLonLatArea(void);
          void computeConnectedServer(void) ;
-         
-         void AllgatherRectilinearLonLat(CArray<double,1>& lon, CArray<double,1>& lat, 
+
+         void AllgatherRectilinearLonLat(CArray<double,1>& lon, CArray<double,1>& lat,
                                          CArray<double,1>& lon_g, CArray<double,1>& lat_g);
-         
-         void fillInRectilinearBoundLonLat(CArray<double,1>& lon, CArray<double,1>& lat, 
+
+         void fillInRectilinearBoundLonLat(CArray<double,1>& lon, CArray<double,1>& lat,
                                            CArray<double,2>& boundsLon, CArray<double,2>& boundsLat);
          void fillInRectilinearLonLat();
@@ -170 +167 @@
          void checkArea(void);
          void checkLonLat();
+         void checkZoom(void);
 
          void checkTransformations();

XIOS/trunk/src/node/grid.cpp

@@ -262 +262 @@
      }
      this->isChecked = true;
+   }
+
+   void CGrid::createMask(void)
+   {
+      using namespace std;
+      std::vector<CDomain*> domainP = this->getDomains();
+      std::vector<CAxis*> axisP = this->getAxis();
+      int dim = domainP.size() * 2 + axisP.size();
+
+      std::vector<CArray<bool,1>* > domainMasks(domainP.size());
+      for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->mask_1d);
+      std::vector<CArray<bool,1>* > axisMasks(axisP.size());
+      for (int i = 0; i < axisMasks.size(); ++i) axisMasks[i] = &(axisP[i]->mask);
+
+      switch (dim) {
+        case 1:
+          checkGridMask(mask_1d, domainMasks, axisMasks, axis_domain_order, true);
+          break;
+        case 2:
+          checkGridMask(mask_2d, domainMasks, axisMasks, axis_domain_order, true);
+          break;
+        case 3:
+          checkGridMask(mask_3d, domainMasks, axisMasks, axis_domain_order, true);
+          break;
+        default:
+          break;
+      }
    }
 

XIOS/trunk/src/node/grid.hpp

@@ -206 +206 @@
          map<int, CArray<size_t, 1> > outIndexFromClient, compressedOutIndexFromClient;
          void checkMask(void);
+         void createMask(void);
          void modifyMask(const CArray<int,1>& indexToModify);
 
@@ -217 +218 @@
                           const std::vector<CArray<bool,1>* >& domainMasks,
                           const std::vector<CArray<bool,1>* >& axisMasks,
-                          const CArray<bool,1>& axisDomainOrder);
+                          const CArray<bool,1>& axisDomainOrder,
+                          bool createMask = false);
         template<int N>
         void modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify);
@@ -295 +297 @@
                              const std::vector<CArray<bool,1>* >& domainMasks,
                              const std::vector<CArray<bool,1>* >& axisMasks,
-                             const CArray<bool,1>& axisDomainOrder)
+                             const CArray<bool,1>& axisDomainOrder,
+                             bool createMask)
    {
      int idx = 0;
@@ -319 +322 @@
     }
 
-    if (!gridMask.isEmpty())
+    if (!gridMask.isEmpty() && !createMask)
     {
       for (int i = 0; i < dim; ++i)