Changeset 1249 for XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.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/domain.hpp (modified) (4 diffs)

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

@@ -92 +92 @@
          bool isWrittenCompressed(const StdString& filename) 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);
@@ -113 +114 @@
          
          void computeWrittenIndex();
+         void computeWrittenCompressedIndex(MPI_Comm);
 
          void AllgatherRectilinearLonLat(CArray<double,1>& lon, CArray<double,1>& lat,
@@ -138 +140 @@
          CArray<double, 1> areavalue;
 
-         CArray<size_t,1> localIndexToWriteOnServer;
-         CArray<int, 1> compressedIndexToWriteOnServer;
+         CArray<size_t,1> localIndexToWriteOnServer;         
 
          CArray<bool, 1> localMask;
@@ -209 +210 @@
          std::vector<int> indexesToWrite;
          std::vector<int> recvClientRanks_;
-         int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;         
+         std::map<int,int> numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
+         std::map<int, CArray<int, 1> > compressedIndexToWriteOnServer;     
          std::map<CContextClient*, std::map<int,size_t> > connectedDataSize_;
          std::map<CContextClient*, std::vector<int> > connectedServerRank_;