Changeset 821 for XIOS/trunk/src/node/axis.cpp

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

File:

• XIOS/trunk/src/node/axis.cpp (modified) (7 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 ;