Changeset 2131 for XIOS/trunk/src/node/grid.hpp

Timestamp:

04/23/21 15:00:35 (3 years ago)

Author:

oabramkina

Message:

Merging branch dev_oa with tiling into trunk

File:

• XIOS/trunk/src/node/grid.hpp (modified) (11 diffs)

XIOS/trunk/src/node/grid.hpp

@@ -91 +91 @@
          StdSize  getDataSize(void) const;
 
+         StdSize  getTileDataSize(int tileId);
+
+         StdSize  getTileSize(int tileId);
+
          /// Entrees-sorties de champs
          template <int n>
          void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
          template <int n>
-         void maskField(const CArray<double,n>& field, CArray<double,1>& stored) const;
+         void maskField(const CArray<double,n>& field, CArray<double,1>& stored, bool isTiled = false) const;
          template <int n>
          void outputField(const CArray<double,1>& stored, CArray<double,n>& field) const;  
          template <int n>
          void uncompressField(const CArray<double,n>& data, CArray<double,1>& outData) const; 
+         template <int n>
+         void copyTile(const CArray<double,n>& tileData, CArray<double, 1>& stored, int tileId);
 
          virtual void parse(xml::CXMLNode& node);
@@ -205 +211 @@
       public:
          CArray<int, 1> storeIndex_client;
+         CArray<int, 1> storeIndexTiled_client;
          CArray<bool, 1> storeMask_client;
+         CArray<bool, 1> storeMaskTiled_client;
 
 /** Map containing indexes that will be sent in sendIndex(). */
@@ -223 +231 @@
 /** Map storing received indexes. Key = sender rank, value = index array. */
          map<int, CArray<size_t, 1> > outGlobalIndexFromClient;
+
+/** Map storing received indexes. Key = sender rank, value = index array for tiled domains */
+         map<int, CArray<size_t, 1> > outGlobalIndexFromClientTiled;
 
 // Manh Ha's comment: " A client receives global index from other clients (via recvIndex)
@@ -232 +243 @@
  *  The map is created in CGrid::computeClientIndex and filled upon receiving data in CField::recvUpdateData() */
          map<int, CArray<size_t, 1> > outLocalIndexStoreOnClient; 
+
+/** Map storing received data. Key = sender rank, value = data array.
+ *  The map is created in CGrid::computeClientIndex and filled upon receiving data in CField::recvUpdateData() */
+         map<int, CArray<size_t, 1> > outLocalIndexStoreOnClientTiled;
+
 
 /** Indexes calculated based on server-like distribution.
@@ -255 +271 @@
                                          const std::vector<CScalar*>& scalars,
                                          const CArray<int,1>& axisDomainOrder);
+
+         int getNTiles();
+         bool isTiled(void) const;
+         bool isTiledOnly(void) const;
 
       private:
@@ -272 +292 @@
         void restoreField_arr(const CArray<double, 1>& stored, double* const data) const;
         void uncompressField_arr(const double* const data, CArray<double, 1>& outData) const;
-        void maskField_arr(const double* const data, CArray<double, 1>& stored) const;
+        void maskField_arr(const double* const data, CArray<double, 1>& stored, bool isTiled = false) const;
+        void copyTile_arr(const double* const tileData, CArray<double, 1>& stored, int tileId);
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
@@ -299 +320 @@
 
         void computeClientIndex();
+        void computeClientIndexTiled();
         void computeConnectedClients();
         void computeClientIndexScalarGrid(); 
         void computeConnectedClientsScalarGrid(); 
 
+        void computeTileIndex();
+
       private:
 
@@ -312 +336 @@
         bool isDomainAxisChecked;
         bool isIndexSent;
+
+        int nTiles_;
+/** True if tiled data is defined on the grid */
+        bool isTiled_;
+/** True if ONLY tiled data is defined on the grid */
+        bool isTiledOnly_;
+
+/** Vector containing local domain indexes for each tile */
+        std::vector<CArray<int,1> > storeTileIndex;
 
         CDomainGroup* vDomainGroup_;
@@ -321 +354 @@
 /** Client-like distribution calculated based on the knowledge of the entire grid */
         CDistributionClient* clientDistribution_;
+
+/** Client-like distribution calculated based on the knowledge of the entire grid in case of a tiled domain */
+        CDistributionClient* clientDistributionTiled_;
+
 
 /** Server-like distribution calculated upon receiving indexes */
@@ -387 +424 @@
 
    template <int n>
-   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored) const
+   void CGrid::copyTile(const CArray<double,n>& tileData, CArray<double,1>& storedData, int tileId)
+   {
+      this->copyTile_arr(tileData.dataFirst(), storedData, tileId);
+   }
+
+   template <int n>
+   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored, bool isTiled) const
    {
 //#ifdef __XIOS_DEBUG
       if (this->getDataSize() != field.numElements())
-         ERROR("void CGrid::inputField(const  CArray<double,n>& field, CArray<double,1>& stored) const",
+         ERROR("void CGrid::maskField(const  CArray<double,n>& field, CArray<double,1>& stored) const",
                 << "[ Awaiting data of size = " << this->getDataSize() << ", "
                 << "Received data size = "      << field.numElements() << " ] "
@@ -397 +440 @@
                 << "Grid = " << this->getId())
 //#endif
-      this->maskField_arr(field.dataFirst(), stored);
+      this->maskField_arr(field.dataFirst(), stored, isTiled);
    }