Changeset 1882 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

Timestamp:

05/18/20 10:11:57 (4 years ago)

Author:

ymipsl

Message:

Xios coupling branch
Refactor and simplify file writer filter management on server side.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp (modified) (16 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -235 +235 @@
   TRY
   {
+    // ym to remove latter
+    /*
     CContext* context = CContext::getCurrent();
     Time timeStamp ;
@@ -257 +259 @@
     if (opeDate <= currDate)
     {
+      
       auto& outLocalIndexStoreOnClient = grid_-> getOutLocalIndexStoreOnClient() ;
       for (auto it = outLocalIndexStoreOnClient.begin(); it != outLocalIndexStoreOnClient.end(); ++it)
@@ -266 +269 @@
       }
     }
+*/
+    Time timeStamp ;
+    CArray<int,1>& storeClient = grid_->getStoreIndex_client(); // replace it with local size
+    CArray<double,1> recv_data_tmp(storeClient.numElements());
+    auto& outLocalIndexStoreOnClient = grid_-> getOutLocalIndexStoreOnClient() ;
+    for (auto it = outLocalIndexStoreOnClient.begin(); it != outLocalIndexStoreOnClient.end(); ++it)
+    {
+      CArray<double,1> tmp;
+      CArray<size_t,1>& indexTmp = it->second;
+      *(rankBuffers[it->first]) >> timeStamp >> tmp;
+      for (int idx = 0; idx < indexTmp.numElements(); ++idx) recv_data_tmp(indexTmp(idx)) = tmp(idx);
+    }
 
     this->setData(recv_data_tmp);
+/*
     // delete incomming flux for server only
     recvFoperationSrv.reset() ;
     recvDataSrv.reset() ;
-  }
-  CATCH_DUMP_ATTR
-
+*/
+  }
+  CATCH_DUMP_ATTR
+
+  /* ym : old interface : to be removed...
   void CField::writeUpdateData(const CArray<double,1>& data)
   TRY
@@ -303 +321 @@
   }
   CATCH_DUMP_ATTR
-
-  void CField::writeField(void)
+  */
+
+  void CField::writeUpdateData(const CArray<double,1>& data)
+  TRY
+  {
+    const CDate writeDate = last_Write_srv + freq_write_srv;
+    last_Write_srv = writeDate;
+    grid_->computeWrittenIndex();
+    /*
+    recvDataSrv.resize(data.numElements()) ;
+    recvDataSrv = data ;
+    */
+    writeField(data);
+    lastlast_Write_srv = last_Write_srv;
+  }
+  CATCH_DUMP_ATTR
+
+
+  void CField::writeField(const CArray<double,1>& data)
   TRY
   {
@@ -313 +348 @@
         getRelFile()->checkWriteFile();
         this->incrementNStep();
-        getRelFile()->getDataOutput()->writeFieldData(CField::get(this));
+        getRelFile()->getDataOutput()->writeFieldData(CField::get(this), data);
       }
     }
@@ -403 +438 @@
     CEventClient event(getType(), EVENT_ID_READ_DATA_READY);
     std::list<CMessage> msgs;
-
-    EReadField hasData = readField();
+    
+    CArray<double,1> data ;
+    EReadField hasData = readField(data);
 
     map<int, CArray<double,1> >::iterator it;
@@ -411 +447 @@
        if (client->isServerLeader())
        {
-          if (0 != recvDataSrv.numElements())
+          if (0 != data.numElements())
           {            
             const std::list<int>& ranks = client->getRanksServerLeader();
@@ -422 +458 @@
               {
                 case RF_DATA:
-                  msg << getNStep() - 1 << recvDataSrv;
+                  msg << getNStep() - 1 << data;
                   break;
                 case RF_NODATA:
-                  msg << int(-2) << recvDataSrv;
+                  msg << int(-2) << data;
                   break;
                 case RF_EOF:                  
@@ -452 +488 @@
         for (int idx = 0; idx < indexTmp.numElements(); ++idx)
         {
-          tmp(idx) = recvDataSrv(indexTmp(idx));
+          tmp(idx) = data(indexTmp(idx));
         } 
 
@@ -484 +520 @@
     \return State of field can be read from a file
   */
-  CField::EReadField CField::readField(void)
+  CField::EReadField CField::readField(CArray<double,1>& data)
   TRY
   {
@@ -496 +532 @@
       if (grid_->doGridHaveDataToWrite() || getRelFile()->type == CFile::type_attr::one_file)      
       {
-        if (0 == recvDataSrv.numElements())
-        {            
           CArray<int,1>& storeClient = grid_->getStoreIndex_client();          
-          recvDataSrv.resize(storeClient.numElements());          
-        }
+          data.resize(storeClient.numElements());          
         
         getRelFile()->checkReadFile();
@@ -515 +548 @@
 
         if (RF_EOF != readState)
-          getRelFile()->getDataInput()->readFieldData(CField::get(this));
+          getRelFile()->getDataInput()->readFieldData(CField::get(this),data);
       }
     }
@@ -2018 +2051 @@
   CATCH_DUMP_ATTR
 
-  void CField::scaleFactorAddOffset(double scaleFactor, double addOffset)
-  TRY
-  {
-    recvDataSrv = (recvDataSrv - addOffset) / scaleFactor;
-  }
-  CATCH_DUMP_ATTR
-
-  void CField::invertScaleFactorAddOffset(double scaleFactor, double addOffset)
-  TRY
-  {
-    recvDataSrv = recvDataSrv * scaleFactor + addOffset;
-  }
-  CATCH_DUMP_ATTR
-
-  void CField::outputField(CArray<double,1>& fieldOut)
+  void CField::scaleFactorAddOffset(CArray<double,1>& data, double scaleFactor, double addOffset)
+  TRY
+  {
+    data = (data - addOffset) / scaleFactor;
+  }
+  CATCH_DUMP_ATTR
+
+  void CField::invertScaleFactorAddOffset(CArray<double,1>& data, double scaleFactor, double addOffset)
+  TRY
+  {
+    data = data * scaleFactor + addOffset;
+  }
+  CATCH_DUMP_ATTR
+
+  void CField::outputField(const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
   TRY
   { 
@@ -2039 +2072 @@
     for (size_t idx = 0; idx < outIndexServer.numElements(); ++idx)
     {
-      fieldOut(outIndexServer(idx)) = recvDataSrv(outIndexClient(idx));
-    }
-  }
-  CATCH_DUMP_ATTR
-
-  void CField::inputField(CArray<double,1>& fieldIn)
+      dataOut(outIndexServer(idx)) = dataIn(outIndexClient(idx));
+    }
+  }
+  CATCH_DUMP_ATTR
+
+  void CField::inputField(const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
   TRY
   {
@@ -2051 +2084 @@
     for (size_t idx = 0; idx < outIndexServer.numElements(); ++idx)
     {
-      recvDataSrv(outIndexClient(idx)) = fieldIn(outIndexServer(idx));
-    }
-  }
-  CATCH_DUMP_ATTR
-
- void CField::outputCompressedField(CArray<double,1>& fieldOut)
+      dataOut(outIndexClient(idx)) = dataIn(outIndexServer(idx));
+    }
+  }
+  CATCH_DUMP_ATTR
+
+ void CField::outputCompressedField(const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
  TRY
  {
@@ -2063 +2096 @@
     for (size_t idx = 0; idx < outIndexServer.numElements(); ++idx)
     {
-      fieldOut((idx)) = recvDataSrv(outIndexClient(idx));
+      dataOut((idx)) = dataIn(outIndexClient(idx));
     }
   }