Changeset 709 for XIOS/trunk/src/io/nc4_data_output.cpp

Timestamp:

09/29/15 14:01:53 (9 years ago)

Author:

mhnguyen

Message:

Correcting a bug in interpolation domain

+) Replace shared send buffer by seperate buffer for each proc
+) Remove some redundant codes

Test
+) On Curie
+) test_client, test_complete and test_remap pass

File:

• XIOS/trunk/src/io/nc4_data_output.cpp (modified) (1 diff)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1625 +1625 @@
                   }
 /*
-                  int ssize = nZoomBeginGlobal.size();
                   for (int i = numElement - 1; i >= 0; --i)
 
 
-                  start.resize(ssize);
-                  count.resize(ssize);
-
-                  for (int i = 0; i < ssize; ++i)
+                  start.reserve(nZoomBeginGlobal.size());
+                  count.reserve(nZoomBeginGlobal.size());
+
+
+                  for (int i = numElement - 1; i >= 0; --i)
                   {
-                    start[i] = nZoomBeginServer[ssize - i - 1] - nZoomBeginGlobal[ssize - i - 1];
-                    count[i] = nZoomSizeServer[ssize - i - 1];
+                    if (axisDomainOrder(i))
+                    {
+                      CDomain* domain = CDomain::get(domainList[idxDomain]);
+
+                      if (CDomain::type_attr::unstructured != domain->type)
+                      {
+                        start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
+                        count.push_back(nZoomSizeServer[idx]);
+                      }
+                      --idx;
+                      start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
+                      count.push_back(nZoomSizeServer[idx]);
+                      --idx;
+
+                      --idxDomain;
+                      //idx -= 2;
+                    }
+                    else
+                    {
+                      CAxis* axis = CAxis::get(axisList[idxAxis]);
+
+                      start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);
+                      count.push_back(nZoomSizeServer[idx]);
+
+                      --idxAxis;
+                      --idx;
+                    }
                   }
-*/
+
+//                  int ssize = nZoomBeginGlobal.size();
+//
+//                  start.resize(ssize);
+//                  count.resize(ssize);
+//
+//                  for (int i = 0; i < ssize; ++i)
+//                  {
+//                    start[i] = nZoomBeginServer[ssize - i - 1] - nZoomBeginGlobal[ssize - i - 1];
+//                    count[i] = nZoomSizeServer[ssize - i - 1];
+//                  }
                 }