Changeset 821 for XIOS/trunk/src/node/domain.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/domain.cpp (modified) (5 diffs)

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;