Changeset 569 for XIOS/trunk/src/client_server_mapping.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Correct some bugs on discovering server index and do some code cleanings

+) Add some checking functions to make sure mpi_isend and mpi_irecv work correctly
+) Add comments to code
+) Remove some redundant code and comments

Test
+) On Curie
+) The new functions are tested in test_new_features.f90. Test_client and test_complete work like before
+) Test cases:

• 3 dimension grid with: 1 domain, 1 axis
• 3 dimension grid with: 3 axis
• Attached and connected

+) All pass and results are correct

TODO:
+) Fix zoom bug with grid composed of only one axis

File:

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

XIOS/trunk/src/client_server_mapping.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 04 Feb 2015
-   \date 06 Feb 2015
+   \date 09 Mars 2015
 
    \brief Mapping between index client and server.
@@ -20 +20 @@
 }
 
-void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-                                                     const CArray<int,1>& localIndexOnClient)
-{
-//  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexServer);
-}
-
-
+/*!
+  Compute mapping global index of server which client sends to.
+  \param [in] globalIndexOnClient global index on client
+  \param [in] globalIndexServer global index of servers
+*/
 void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
                                                      const std::vector<CArray<size_t,1>* >& globalIndexServer)
@@ -33 +31 @@
 }
 
-//void CClientServerMapping::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
-//                                                     const CArray<int,1>& localIndexOnClient,
-//                                                     const std::vector<CArray<size_t,1>* >& globalIndexOfServer)
-//{
-//  defaultComputeServerIndexMapping(globalIndexOnClient, globalIndexOfServer, &localIndexOnClient);
-//}
-
 /*!
    Compute index of data which are sent to server and index global on server side
    \param [in] globalIndexOnClient global index of data on client
    \param [in] globalIndexServer global index of server(s)
+   \param [in] localIndexOnClient local index of data on client which are sent to server
 */
 void CClientServerMapping::defaultComputeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient,
@@ -129 +121 @@
   for(int n=0;n<recvSize;n++) clientRes[recvBuff[n]]++ ;
 
-//  std::map<int,int> nbSenders;
   for(int n=0;n<nbConnectedServer;n++)
   {