Changeset 2034 for XIOS/dev/dev_oa/src/node/grid.cpp

Timestamp:

02/15/21 21:14:02 (3 years ago)

Author:

oabramkina

Message:

Adding a possibility of tiled and non-tiled sent on the same domain.

File:

• XIOS/dev/dev_oa/src/node/grid.cpp (modified) (7 diffs)

XIOS/dev/dev_oa/src/node/grid.cpp

@@ -40 +40 @@
       , clients()
       , nTiles_(0)
-      , isTiled_(false)
+      , isTiled_(false), isTiledOnly_(false)
       , storeTileIndex()
    {
@@ -64 +64 @@
       , clients()
       , nTiles_(0)
-      , isTiled_(false)
+      , isTiled_(false), isTiledOnly_(false)
       , storeTileIndex()
    {
@@ -638 +638 @@
           else domListP[i]->checkAttributesOnClient();
           if (domListP[i]->isTiled()) this->isTiled_ = true;
+          if (domListP[i]->isTiledOnly()) this->isTiledOnly_ = true;
         }
       }
@@ -802 +803 @@
           outLocalIndexStoreOnClient.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
           CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient[rank];
+          size_t nbIndex = 0;
+
+          // Keep this code for this moment but it should be removed (or moved to DEBUG) to improve performance
+          for (size_t idx = 0; idx < globalIndex.numElements(); ++idx)
+          {
+            if (itGloe != globalDataIndex.find(globalIndex(idx)))
+            {
+              ++nbIndex;
+            }
+          }
+
+          if (doGridHaveDataDistributed(client) && (nbIndex != localIndex.numElements()))
+               ERROR("void CGrid::computeClientIndex()",
+                  << "Number of local index on client is different from number of received global index"
+                  << "Rank of sent client " << rank <<"."
+                  << "Number of local index " << nbIndex << ". "
+                  << "Number of received global index " << localIndex.numElements() << ".");
+
+          nbIndex = 0;
+          for (size_t idx = 0; idx < globalIndex.numElements(); ++idx)
+          {
+            if (itGloe != globalDataIndex.find(globalIndex(idx)))
+            {
+              localIndex(idx) = globalDataIndex[globalIndex(idx)];
+            }
+          }
+        }
+      }
+   }
+   CATCH_DUMP_ATTR
+
+   //---------------------------------------------------------------
+
+   /*
+     Compute the global index and its local index taking account mask and data index.
+     These global indexes will be used to compute the connection of this client (sender) to its servers (receivers)
+     (via function computeConnectedClient)
+     These global indexes also correspond to data sent to servers (if any)
+   */
+   void CGrid::computeClientIndexTiled()
+   TRY
+   {
+     CContext* context = CContext::getCurrent();
+
+     CContextClient* client = context->client;
+     int rank = client->clientRank;
+
+     clientDistributionTiled_ = new CDistributionClient(rank, this, true);
+     // Get local data index on client
+     int nbStoreIndex = clientDistributionTiled_->getLocalDataIndexOnClient().size();
+     int nbStoreGridMask = clientDistributionTiled_->getLocalMaskIndexOnClient().size();
+     // nbStoreGridMask = nbStoreIndex if grid mask is defined, and 0 otherwise
+     storeIndexTiled_client.resize(nbStoreIndex);
+     storeMaskTiled_client.resize(nbStoreGridMask);
+     for (int idx = 0; idx < nbStoreIndex; ++idx) storeIndexTiled_client(idx) = (clientDistributionTiled_->getLocalDataIndexOnClient())[idx];
+     for (int idx = 0; idx < nbStoreGridMask; ++idx) storeMaskTiled_client(idx) = (clientDistributionTiled_->getLocalMaskIndexOnClient())[idx];
+
+     if (0 == serverDistribution_) isDataDistributed_= clientDistributionTiled_->isDataDistributed();
+     else
+     {
+        // Mapping global index received from clients to the storeIndex_client
+        CDistributionClient::GlobalLocalDataMap& globalDataIndex = clientDistributionTiled_->getGlobalDataIndexOnClient();
+        CDistributionClient::GlobalLocalDataMap::const_iterator itGloe = globalDataIndex.end();
+        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClientTiled.begin(),
+                                               ite = outGlobalIndexFromClientTiled.end(), it;
+
+        for (it = itb; it != ite; ++it)
+        {
+          int rank = it->first;
+          CArray<size_t,1>& globalIndex = outGlobalIndexFromClientTiled[rank];
+          outLocalIndexStoreOnClientTiled.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
+          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClientTiled[rank];
           size_t nbIndex = 0;
 
@@ -978 +1051 @@
      else
      {
-       computeClientIndex();
+       if (this->isTiled_)
+       {
+         computeClientIndexTiled();
+         if (!this->isTiledOnly_)
+           computeClientIndex();
+       }
+       else
+         computeClientIndex();
+
        if (this->isTiled_) computeTileIndex();
        if (context->hasClient)
@@ -1543 +1624 @@
    CATCH
 
-   void CGrid::maskField_arr(const double* const data, CArray<double, 1>& stored) const
-   TRY
-   {
-      const StdSize size = storeIndex_client.numElements();
+   void CGrid::maskField_arr(const double* const data, CArray<double, 1>& stored, bool isTiled) const
+   TRY
+   {
+      const CArray<int, 1>& storeIndex_clientP = isTiled ? storeIndexTiled_client : storeIndex_client;
+      const CArray<bool, 1>& storeMask_clientP = isTiled ? storeMaskTiled_client : storeMask_client;
+      const StdSize size = storeIndex_clientP.numElements();
       stored.resize(size);
       const double nanValue = std::numeric_limits<double>::quiet_NaN();
 
-      if (storeMask_client.numElements() != 0)
-        for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_client(i)) ? data[storeIndex_client(i)] : nanValue;
+      if (storeMask_clientP.numElements() != 0)
+        for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_clientP(i)) ? data[storeIndex_clientP(i)] : nanValue;
       else
-        for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client(i)];
+        for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_clientP(i)];
    }
    CATCH
@@ -2513 +2596 @@
   CATCH_DUMP_ATTR
 
+  bool CGrid::isTiled(void) const
+  TRY
+  {
+     return isTiled_;
+  }
+  CATCH
+
+  bool CGrid::isTiledOnly(void) const
+  TRY
+  {
+     return isTiledOnly_;
+  }
+  CATCH
+
   bool CGrid::isTransformed()
   TRY