Changeset 567 for XIOS/trunk/src/node/distribution_server.cpp

Timestamp:

03/10/15 10:49:02 (9 years ago)

Author:

mhnguyen

Message:

Implementing a grid formed by only one axis or group of axis

+) Add several new attributes to axis. From now on, each axis can be distributed on client side
+) Modify mask of grid to make it more flexible to different dimension
+) Fix some bugs relating to calculation of local data index on client
+) Clean some redundant codes

Test
+) On Curie, only test_new_features.f90
+) Test cases:

• Grid composed of: 1 domain and 1 axis, 3 axis, 1 axis
• Mode: Attached and connected
• No of client-server: 6-2(Connected), 2 (Attached)

+) All tests passed and results are correct

File:

• XIOS/trunk/src/node/distribution_server.cpp (modified) (4 diffs)

XIOS/trunk/src/node/distribution_server.cpp

@@ -19 +19 @@
                                          const std::vector<int>& nZoomSize, const std::vector<int>& nGlobal)
   : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin)
+{
+  createGlobalIndex();
+}
+
+CDistributionServer::CDistributionServer(int rank, const std::vector<int>& nZoomBegin,
+                                         const std::vector<int>& nZoomSize,
+                                         const std::vector<int>& nZoomBeginGlobal,
+                                         const std::vector<int>& nGlobal)
+  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(nZoomBeginGlobal),
+    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin)
 {
   createGlobalIndex();
@@ -89 +99 @@
   for (int i = 0; i < ssize; ++i)
   {
-    it = std::lower_bound(it, itEnd, globalIndex(i));
+    it = std::find(itBegin, itEnd, globalIndex(i));
+//    it = std::lower_bound(it, itEnd, globalIndex(i));
     if (itEnd != it)
     {
@@ -114 +125 @@
   for (int i = 0; i < ssize; ++i)
   {
-    it = std::lower_bound(it, itEnd, globalIndex(i));
+    it = std::find(itBegin, itEnd, globalIndex(i));
+//    it = std::lower_bound(it, itEnd, globalIndex(i));
     if (itEnd != it)
     {
@@ -125 +137 @@
 }
 
+
+std::vector<int> CDistributionServer::getZoomBeginGlobal() const
+{
+  return nZoomBeginGlobal_;
+}
+
+std::vector<int> CDistributionServer::getZoomBeginServer() const
+{
+  return nZoomBegin_;
+}
+
+std::vector<int> CDistributionServer::getZoomSizeServer() const
+{
+  return nZoomSize_;
+}
 } // namespace xios