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

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.hpp (modified) (11 diffs)

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

@@ -99 +99 @@
          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;  
@@ -211 +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(). */
@@ -229 +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)
@@ -238 +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.
@@ -263 +273 @@
 
          int getNTiles();
+         bool isTiled(void) const;
+         bool isTiledOnly(void) const;
 
       private:
@@ -280 +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);
 
@@ -308 +320 @@
 
         void computeClientIndex();
+        void computeClientIndexTiled();
         void computeConnectedClients();
         void computeClientIndexScalarGrid(); 
@@ -325 +338 @@
 
         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;
@@ -337 +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 */
@@ -409 +430 @@
 
    template <int n>
-   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored) const
+   void CGrid::maskField(const CArray<double,n>& field, CArray<double,1>& stored, bool isTiled) const
    {
 //#ifdef __XIOS_DEBUG
@@ -419 +440 @@
                 << "Grid = " << this->getId())
 //#endif
-      this->maskField_arr(field.dataFirst(), stored);
-   }
+      this->maskField_arr(field.dataFirst(), stored, isTiled);
+   }
+
+//   template <int n>
+//   void CGrid::maskFieldTiled(const CArray<double,n>& field, CArray<double,1>& stored) const
+//   {
+////#ifdef __XIOS_DEBUG
+//      if (this->getDataSize() != field.numElements())
+//         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() << " ] "
+//                << "The data array does not have the right size! "
+//                << "Grid = " << this->getId())
+////#endif
+//      this->maskField_arr(field.dataFirst(), stored, true);
+//   }
 
    template <int n>