Changeset 1129 for XIOS/dev/dev_olga/src/node/field.cpp

Timestamp:

05/11/17 18:25:20 (7 years ago)

Author:

mhnguyen

Message:

Updating two-level server.
Each client now can play the role of server: It can forward data to other clients or write data like a server.
Each client must combine all data received from other client(s) before forward them or write them on files

+) Correct some bugs of exchange data_index in domain and axis
+) Reorder some functions in context.cpp to make sure that all necessary attributes are available before computing index
+) Add the mapping index for client to write data.

Test
+) On Curie
+) test_client and test_complete
+) Mode:

• Only one level: Correct
• Two levels: Work if using ddt (bug)

+) Only zoom is tested but other transformations should work
+) No reading test

File:

• XIOS/dev/dev_olga/src/node/field.cpp (modified) (10 diffs)

XIOS/dev/dev_olga/src/node/field.cpp

@@ -35 +35 @@
       , nstep(0), nstepMax(0)
       , hasOutputFile(false)
-      , domAxisScalarIds_(vector<StdString>(3,"")), areAllReferenceSolved(false), isReferenceSolved(false)
+      , domAxisScalarIds_(vector<StdString>(3,""))
+      , areAllReferenceSolved(false), isReferenceSolved(false), isReferenceSolvedAndTransformed(false)
       , useCompressedOutput(false)
       , wasDataAlreadyReceivedFromServer(false)
@@ -46 +47 @@
       , nstep(0), nstepMax(0)
       , hasOutputFile(false)
-      , domAxisScalarIds_(vector<StdString>(3,"")), areAllReferenceSolved(false), isReferenceSolved(false)
+      , domAxisScalarIds_(vector<StdString>(3,""))
+      , areAllReferenceSolved(false), isReferenceSolved(false), isReferenceSolvedAndTransformed(false)
       , useCompressedOutput(false)
       , wasDataAlreadyReceivedFromServer(false)
@@ -257 +259 @@
     size_t sizeData = 0;
     if (0 == recvDataSrv.numElements())
-    {      
-      for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
-      {
-        sizeData += it->second.numElements();
-        data_srv.insert(std::make_pair(it->first, CArray<double,1>(it->second.numElements())));
-      }
+    {            
+      CArray<int,1>& storeClient = grid->storeIndex_client;
+      // for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
+      // {
+      //   // sizeData += it->second.numElements();
+      //   data_srv.insert(std::make_pair(it->first, CArray<double,1>(it->second.numElements())));
+      // }
+
+      // for (map<int, CArray<size_t, 1> >::iterator it = grid->outLocalIndexStoreOnClient.begin(); it != grid->outLocalIndexStoreOnClient.end(); ++it)
+      // {
+      //   // sizeData += it->second.numElements();
+      //   data_srv.insert(std::make_pair(it->first, CArray<double,1>(it->second.numElements())));
+      // }
 
       // Gather all data from different clients
-      recvDataSrv.resize(sizeData);
+      // recvDataSrv.resize(sizeData);
+      recvDataSrv.resize(storeClient.numElements());
       recvFoperationSrv = boost::shared_ptr<func::CFunctor>(new func::CInstant(recvDataSrv));
     }
@@ -276 +286 @@
     if (opeDate <= currDate)
     {
-      for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
-      {        
+       for (map<int, CArray<size_t, 1> >::iterator it = grid->outLocalIndexStoreOnClient.begin(); it != grid->outLocalIndexStoreOnClient.end(); ++it)
+      {
         CArray<double,1> tmp;
         CArray<size_t,1>& indexTmp = it->second;
@@ -288 +298 @@
         // sizeData += it->second.numElements();      
       }
+
+      // for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
+      // {        
+      //   CArray<double,1> tmp;
+      //   CArray<size_t,1>& indexTmp = it->second;
+      //   *(rankBuffers[it->first]) >> tmp;
+      //   for (int idx = 0; idx < indexTmp.numElements(); ++idx)
+      //   {
+      //     recv_data_tmp(indexTmp(idx)) = tmp(idx);
+      //   }
+      //   // recv_data_tmp(Range(sizeData,sizeData+it->second.numElements()-1)) = tmp;  
+      //   // sizeData += it->second.numElements();      
+      // }
     }
 
@@ -316 +339 @@
       recvFoperationSrv->final();
       last_Write_srv = writeDate;
+      grid->computeWrittenIndex();
       writeField();
       lastlast_Write_srv = last_Write_srv;
@@ -813 +837 @@
    }
    
-   void CField::solveAllEnabledFields()
+   /*!
+     Solve reference of all enabled fields even the source fields .
+     In this step, we do transformations.
+   */
+   void CField::solveAllEnabledFieldsAndTransform()
    {
      CContext* context = CContext::getCurrent();
@@ -819 +847 @@
      bool hasServer = context->hasServer;
 
-     if (!isReferenceSolved)
-     {
-        isReferenceSolved = true;
+     if (!isReferenceSolvedAndTransformed)
+     {
+        isReferenceSolvedAndTransformed = true;
 
         if (hasClient && !hasServer)
         {
           solveRefInheritance(true);
-          if (hasDirectFieldReference()) getDirectFieldReference()->solveAllEnabledFields();
+          if (hasDirectFieldReference()) getDirectFieldReference()->solveAllEnabledFieldsAndTransform();
         }
 
@@ -992 +1020 @@
    {
      // if (!areAllReferenceSolved) solveAllReferenceEnabledField(false);
-    if (!isReferenceSolved) solveAllEnabledFields();
+    if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform();
      CContext* context = CContext::getCurrent();
      bool hasWriterServer = context->hasServer && !context->hasClient;
@@ -1428 +1456 @@
    void CField::outputField(CArray<double,1>& fieldOut)
    {
-      map<int, CArray<double,1> >::iterator it;
-      
-      fieldOut = recvDataSrv;
-      
+      map<int, CArray<double,1> >::iterator it;      
+     
+      CArray<size_t,1>& outIndexClient = grid->localIndexToWriteOnClient;
+      CArray<size_t,1>& outIndexServer = grid->localIndexToWriteOnServer;
+      for (size_t idx = 0; idx < outIndexServer.numElements(); ++idx)
+      {
+        fieldOut(outIndexServer(idx)) = recvDataSrv(outIndexClient(idx));
+      }
+
       // for (it = data_srv.begin(); it != data_srv.end(); it++)
       // {