Changeset 1201 for XIOS/dev/dev_olga/src/distribution_server.hpp

Timestamp:

07/07/17 18:17:49 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging trunk r1200 (except for non-contiguous zoom) into dev. Tested on Curie. Todo: non-contiguous zoom.

File:

• XIOS/dev/dev_olga/src/distribution_server.hpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/distribution_server.hpp

@@ -23 +23 @@
   public:
     /** Default constructor */
+    CDistributionServer(int rank, int dims, const CArray<size_t,1>& globalIndex = CArray<size_t,1>());
     CDistributionServer(int rank, const std::vector<int>& nZoomBeginServer,
+                        const std::vector<int>& nZoomSizeServer, const std::vector<int>& nGlobal);
+    CDistributionServer(int rank, const std::vector<int>& nZoomBeginServer,
+                        const std::vector<int>& nZoomSizeServer,
+                        const std::vector<int>& nZoomBeginGlobal,
+                        const std::vector<int>& nGlobal);
+
+    CDistributionServer(int rank, 
+                        const std::vector<CArray<int,1> >& globalIndexElements,
+                        const CArray<int,1>& elementOrder,
+                        const std::vector<int>& nZoomBeginServer,
                         const std::vector<int>& nZoomSizeServer,
                         const std::vector<int>& nZoomBeginGlobal,
@@ -51 +62 @@
     std::vector<int> nZoomSize_;
     std::vector<int> nZoomBegin_;
+
 };