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

Timestamp:

10/28/20 16:24:06 (4 years ago)

Author:

oabramkina

Message:

dev_oa: first working version for tiled domains

File:

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

XIOS/dev/dev_oa/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>
@@ -100 +104 @@
          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);
@@ -256 +262 @@
                                          const CArray<int,1>& axisDomainOrder);
 
+         int getNTiles();
+
       private:
        template<int N>
@@ -273 +281 @@
         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 copyTile_arr(const double* const tileData, CArray<double, 1>& stored, int tileId);
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
@@ -303 +312 @@
         void computeConnectedClientsScalarGrid(); 
 
+        void computeTileIndex();
+
       private:
 
@@ -312 +323 @@
         bool isDomainAxisChecked;
         bool isIndexSent;
+
+        int nTiles_;
+        bool isTiled_;
+/** Vector containing local domain indexes for each tile */
+        std::vector<CArray<int,1> > storeTileIndex;
 
         CDomainGroup* vDomainGroup_;
@@ -387 +403 @@
 
    template <int n>
+   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) 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() << " ] "