Changeset 567 for XIOS/trunk/src/client_server_mapping.hpp

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/client_server_mapping.hpp (modified) (2 diffs)

XIOS/trunk/src/client_server_mapping.hpp

@@ -33 +33 @@
                                            const std::vector<CArray<size_t,1>* >& globalIndexOnServer);
 
+    virtual void computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+                                           const CArray<int,1>& localIndexOnClient,
+                                           const std::vector<CArray<size_t,1>* >& globalIndexOnServer);
+
     std::map<int,int> computeConnectedClients(int nbServer, int nbClient,
                                               MPI_Comm& clientIntraComm,
@@ -42 +46 @@
   protected:
     void defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                          const std::vector<CArray<size_t,1>* >& globalIndexOnServer);
+                                          const std::vector<CArray<size_t,1>* >& globalIndexOnServer,
+                                          const CArray<int,1>* localIndexOnClient = 0);
 
   private: