Changeset 567 for XIOS/trunk/src/client_server_mapping.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/client_server_mapping.cpp (modified) (3 diffs)

XIOS/trunk/src/client_server_mapping.cpp

@@ -26 +26 @@
 }
 
+void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
+                                                     const CArray<int,1>& localIndexOnClient,
+                                                     const std::vector<CArray<size_t,1>* >& globalIndexOnServer)
+{
+  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexOnServer, &localIndexOnClient);
+}
+
 /*!
    Compute index of data which are sent to server and index global on server side
@@ -32 +39 @@
 */
 void CClientServerMapping::defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                                            const std::vector<CArray<size_t,1>* >& globalIndexServer)
+                                                            const std::vector<CArray<size_t,1>* >& globalIndexServer,
+                                                            const CArray<int,1>* localIndexOnClient)
 {
   int nServer = globalIndexServer.size();
@@ -52 +60 @@
         // Just try to calculate local index server on client side
         (indexGlobalOnServer_[j]).push_back((globalIndexOnClient)(i));
-        (localIndexSend2Server_[j]).push_back(i);
+        if (0 != localIndexOnClient) (localIndexSend2Server_[j]).push_back((*localIndexOnClient)(i));
+        else
+          (localIndexSend2Server_[j]).push_back(i);
         continue;
       }