Changeset 1249 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp

Timestamp:

08/30/17 15:33:51 (7 years ago)

Author:

mhnguyen

Message:

Various bug fixes on mask and zoom

+) Rearrange local index on the receiving side to be coherent global index
+) Include masking information in compress data (data_index) on the receiving side
+) Correct zoom to work in case there are several (not all) processes participating to write data

Test
+) On Curie
+) Simple test

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp (modified) (4 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.hpp

@@ -69 +69 @@
          const std::set<StdString> & getRelFiles(void) const;
 
-         int getNumberWrittenIndexes() const;
-         int getTotalNumberWrittenIndexes() const;
-         int getOffsetWrittenIndexes() const;
+         int getNumberWrittenIndexes(MPI_Comm writtenCom);
+         int getTotalNumberWrittenIndexes(MPI_Comm writtenCom);
+         int getOffsetWrittenIndexes(MPI_Comm writtenCom);
+         CArray<int, 1>& getCompressedIndexToWriteOnServer(MPI_Comm writtenCom);
 
          std::map<int, StdSize> getAttributesBufferSize(CContextClient* client);
@@ -110 +111 @@
 
          void computeWrittenIndex();
+         void computeWrittenCompressedIndex(MPI_Comm);
          bool hasTransformation();
          void solveInheritanceTransformation();
@@ -120 +122 @@
       public: 
         bool hasValue;        
-        CArray<size_t,1> localIndexToWriteOnServer;
-        CArray<int, 1> compressedIndexToWriteOnServer;
+        CArray<size_t,1> localIndexToWriteOnServer;        
 
       private:
@@ -161 +162 @@
          boost::unordered_map<size_t,size_t> globalLocalIndexMap_;
          std::vector<int> indexesToWrite;
-         int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
+         std::map<int,int> numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
+         std::map<int, CArray<int, 1> > compressedIndexToWriteOnServer;
          std::map<CContextClient*, std::vector<int> > connectedServerRank_;         
          bool hasBounds;